From nobody Mon Jun 8 20:47:35 2026 X-Original-To: dev-commits-src-all@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 4gZ3yN4ngVz6gjZZ for ; Mon, 08 Jun 2026 20:47:40 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gZ3yN4DF1z3vV1 for ; Mon, 08 Jun 2026 20:47:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780951660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bB/O0Sk0ulaoyPYXWkJPm7kb2uf+Vufbf9bFmpxYhRI=; b=Zm/AvuAzJ4Qj3mt+LqQLMT5513kjxcYM00xZel8K5oJ8JCnh7J8vWWFwkgC7DZxQxUZIwZ tQ1fup3sPdzIf6N6TNc9lfPGX8tvypfOlNV0ZxFlqTjiWWW+Km3sPBBM+39/Z/EQKfXrs+ aVmMJ1yM1DYzBRdJUh8D9R93SydJEV+3QxUjAu+lQ7ZvhqmKId1DKGbnDRLtQQ4Q09Ytws xaGHiA4RXTC/ylOCIUklmk14tQbsmqiKEcpRPl5trPc09HAqEJn48UXLo+D/yHYK6eiljk pWGI1h7SsjYGmGjVtpUEq17nwpsAx+LR9k0GBdmnAUspeNa2T+vDtxba/MItRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780951660; a=rsa-sha256; cv=none; b=R9aW8XmnYnzPo8euv5kUfqFWfqk+5Vh1mghP7BJm1NRYG35hN4Q6uYXnq4YPsxDwkirdm6 +cI33JBY+qHi1+qDQGetSUy+jv1NKYoAiiTbs+0vlUIGStmEDCCfMDENAV+z2eRlw6g1Ow 6RgeIBb/1sAUAf6cuOGEzm8MROTrl0LNEHAgZdQjqUktCtU5fViYq+STVim15M79BTexd4 +3Txa25q7RTg4wD8QePg6PXtHQ4k+t5ZyqMlP2cW5ROfpOuAJhA1yqagGlRCWLSyxNkBJU 1DwEG3dUT6FUOFz4Lmwlh+lgTTSzZhXRtLhgmiNe1hQ23H/VdMvgE0lPB2iC8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780951660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bB/O0Sk0ulaoyPYXWkJPm7kb2uf+Vufbf9bFmpxYhRI=; b=TSEzPP2j4ePsDmEOUl5NkMmAUpYSQMYgCSj4Ooz8orp3vO72t781Xb968tM9EtNbqvz2eK tr+Njn0Yc5j32PQae+lj8Oh8QRnsbFPXIZxr7y21kctq2n/bsbfH4DZkj+V8//ZW/2i3Y2 q8ldcn4YEsiFJS7rf4DX/OiLnrOlaOdElghVS57OF6E4vp6tw/JU74BrsqGY+uXeONZxA1 nNEcDx9P32qk0pld7rh7gV6ez1+qPyhpgVGpvBXqQbp06+MCmCq+K4srE+OeLGQGzppGHp wBjiCNJxGrae3fM+d+8z87EEtzKJmRy39MquyXHcffrntamjhGjEkh7zG8TniA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gZ3yN3j6wz141c for ; Mon, 08 Jun 2026 20:47:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4434b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 08 Jun 2026 20:47:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: b16c731b0191 - main - ipfw nat: Add assertion that mbuf is not a chain List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b16c731b0191d6c47de46a3c6057b0c5ec0dd420 Auto-Submitted: auto-generated Date: Mon, 08 Jun 2026 20:47:35 +0000 Message-Id: <6a272a67.4434b.4d38b685@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b16c731b0191d6c47de46a3c6057b0c5ec0dd420 commit b16c731b0191d6c47de46a3c6057b0c5ec0dd420 Author: Ed Maste AuthorDate: 2026-06-05 21:00:07 +0000 Commit: Ed Maste CommitDate: 2026-06-08 20:47:24 +0000 ipfw nat: Add assertion that mbuf is not a chain Discarding m_free's return value will result in an mbuf leak if the mbuf was in a chain. In general we should use m_freem if the mbuf may be in a chain, or assert that the return was NULL. There will not be a chain here due to m_megapullup, so add an assert. Reviewed by: ae Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D57479 --- sys/netpfil/ipfw/ip_fw_nat.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/ipfw/ip_fw_nat.c b/sys/netpfil/ipfw/ip_fw_nat.c index e816c7bd95eb..6ebde03fe2e3 100644 --- a/sys/netpfil/ipfw/ip_fw_nat.c +++ b/sys/netpfil/ipfw/ip_fw_nat.c @@ -291,7 +291,7 @@ free_nat_instance(struct cfg_nat *ptr) static int ipfw_nat(struct ip_fw_args *args, struct cfg_nat *t, struct mbuf *m) { - struct mbuf *mcl; + struct mbuf *mcl, *mfree __diagused; struct ip *ip; /* XXX - libalias duct tape */ int ldt, retval, found; @@ -396,7 +396,8 @@ ipfw_nat(struct ip_fw_args *args, struct cfg_nat *t, struct mbuf *m) (retval == PKT_ALIAS_IGNORED && (t->mode & PKT_ALIAS_DENY_INCOMING) != 0)))) { /* XXX - should i add some logging? */ - m_free(mcl); + mfree = m_free(mcl); + MPASS(mfree == NULL); args->m = NULL; return (IP_FW_DENY); }