From nobody Thu Oct 29 06:03:18 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jFYYy3gKkz6xrCR for ; Thu, 29 Oct 2026 06:03:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jFYYy0wSZz4sZG for ; Thu, 29 Oct 2026 06:03:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793253798; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TiYEhzdrwvpGrIwesx0bvMy5dwvBh/SrEPEkhLzNeZQ=; b=CbpAS5KkPMuYFKLeaKPh4YUqDy/eUZ2hlEGITyCs0TEUiiYsRuyi3A5dzwncZWJYw4gP8V jw5viNbrEf1fC8Oup2+rY752Q5O83JceUfNgZzzmKgW4UhAXfLQExz1KOwuRRfl/uxZjMs 2/ajJJp+BnUzFPdIQQGZVlNDKZ9OeKeLeE7iq0vntn9bKF8ZBILKR/yFFpfeV1LHU2zssw V48Su6euEEUFn+e7aWqg2PzEqlOarBghnwU9o0rLQAjqob8lxBoSqohhzIgTxvF+2b109e 7Ltb+ZUsqSAitz3rgGUvW1XEgkAG7T3+1MjUEMhwtQNHsCvOcN8SQarqdnm05w== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793253798; b=X2pCB70d+5u+qzAHosT9pdipOmzTQJ/NTYsOCd0FMpXIY1vjCq5PYUwi+3xas9IYH59Hgm QlT8/3bRrcSAAwz40TZD74aqDeuiAnARBs2ZHkU/Defz2pjWzq3iVVykhbF7+d8WI/alcj ll7VJ7cuS26ZL8qDV4PkGHOnVfbVfAaEZgUbilM9rTzQ5hcj8cJ8b5vhv4QOgltMpUxMWZ gfkBmkQCTmI2aCnHthCEV5+R5ORe8GAlVOMOAef/CBRLDZG5MVfIIQbcsEWAMnQwy+OUG3 nA447NR9KV2BHuIXxpx+ovEdMHofp+/gUs5JolDLHG7XOaFmDAXWN/quh9T/UQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793253798; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TiYEhzdrwvpGrIwesx0bvMy5dwvBh/SrEPEkhLzNeZQ=; b=D+XrLRmcbg9dvUUuJxdRe3/1vHH6fvU1NxGPfs7UvFtceH+zn7etF21ErZmxzzc8SzE+I9 2mG8gyqWJ7vkSVUK+8Lkhabq0gGpueDC/9JQP/GKTJTB+Sa2O8ttSGsL1B4+/aAB5tTwLJ 3gevE/zJrnWz6YThqfrMxa4bw/1EDSdiZ7ef0ndrVm2DR1Xt6g+XoZjKgLnrj8uKqJ2Bbu gWIse46gx1zNKIsE1zMz1q+hsiDePlviylvv+UujQlrO8uGsYQG6N0iqKNWvx+N4bv+H5o bA/1tRsK/9RGuooT//HYIaXGqbs90+mptN3qF7U+84kBXi8WddVgYuwT6asLUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jFYYy0ZH1zQsm for ; Thu, 29 Oct 2026 06:03:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 396d8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Oct 2026 06:03:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Reid Linnemann From: Kevin Bowling Subject: git: cc3860d45fdc - stable/15 - iflib: Fix mbufs leaked by 0 len packets emitted from the if driver List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cc3860d45fdccc8d5930ec6cff2035bfebf0bd21 Auto-Submitted: auto-generated Date: Thu, 29 Oct 2026 06:03:18 +0000 Message-Id: <6ae2e1a6.396d8.30dc871b@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=cc3860d45fdccc8d5930ec6cff2035bfebf0bd21 commit cc3860d45fdccc8d5930ec6cff2035bfebf0bd21 Author: Reid Linnemann AuthorDate: 2026-06-17 18:22:44 +0000 Commit: Kevin Bowling CommitDate: 2026-10-29 05:38:10 +0000 iflib: Fix mbufs leaked by 0 len packets emitted from the if driver Some interface drivers, notably bnxt, can insert 0 length packets onto their receive queues when certain conditions are met, such as discarding packets in the case of bnxt. When this packet gets processed by assemble_segments(), The solitary mbuf on the queue that composes it consist of a single zero length fragment. The loop in assemble_segments() doesn't seem to expect that a 0 length fragment can exist in the iri_frags list without a non-zero length header preceding it. In this situation, without filter intervention rxd_frag_to_sd() returns a pointer to the corresponding mbuf in the rxq, where it is matched as a zero-length fragment and immediately discarded without freeing as mh has not yet been assigned. This change corrects this behavior by falling through the mh == NULL case and freeing m on the condition that it is not NULL before continuing the loop. Reviewed by: gallatin Sponsored by: Spectra Logic Differential Revision: https://reviews.freebsd.org/D57537 (cherry picked from commit e2903636a069d5ef364c8f56452bff5818d15f99) --- sys/net/iflib.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index 910694ebf336..5e3bcd2bbb78 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -3164,14 +3164,14 @@ assemble_segments(iflib_rxq_t rxq, if_rxd_info_t ri, if_rxsd_t sd, int *pf_rv) if (ri->iri_frags[i].irf_len == 0 || consumed || *pf_rv == PFIL_CONSUMED || *pf_rv == PFIL_DROPPED) { if (mh == NULL) { - /* everything saved here */ consumed = true; pf_rv_ptr = NULL; - continue; } /* XXX we can save the cluster here, but not the mbuf */ - m_init(m, M_NOWAIT, MT_DATA, 0); - m_free(m); + if (m != NULL) { + m_init(m, M_NOWAIT, MT_DATA, 0); + m_free(m); + } continue; } if (mh == NULL) {