From nobody Mon Nov 02 13:25:04 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 4jJC9r7179z6yLrT for ; Mon, 02 Nov 2026 13:25:04 +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 4jJC9r665xz3NSg for ; Mon, 02 Nov 2026 13:25:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793625904; 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=zTXfjjXyIhTe74Prs8YcIQWc4lghdCK/1r2LD369J78=; b=shcMc9Tdr8lCTz/uCPZwFUzYhipta36hHFBxQCM5QfUxt4GsG+9XWq3rrJln7RoTmgQMvt cTZPlox6tBCHMTNkTHEnzCLUPqgZmYGluVMw0iDfK+LvworL10Nz6VRFs4bzhi7tqe7yrK phMpAY1O4BDH1LQDCRKyYfKRf2ZwzYcedohVNGJJGfikfUPMB7LTUcJ77/Ju2446YKN2kE Ymfc1LyXS8lPVDIR1KV7aHTZgIAWkpTgtLvAFQY73oemuXqNmE15wiDvSHXSTHis9MG4xd SYy81Zj2mGhyfmUrfENgihfjOeFC8tC+UDpSojcMuV+OO+vzfuHiT7jsshd+FA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793625904; b=s/8STtmRfi7vrjNhK0QGoO1ixYSLrSsp3CcZwv4wto6xCsQ95LnZPZAB/y3bOPX+ahLWjD KRAcTt9CRz0/LQuk6P7B+RIPCVmxrx1axRkC+Zksv5EUErxl7mjNEBEChnvvvAQcsP9Th9 1YJGsH8FTBRuMyeubvCMkW73B+JHQNhnoliO7x+DrwUgTWq+cuBZHKUHbKypfbnCJMqEm3 NcLTQfcxgvnrMcViiBcXi4TpaUuyK7ysA37vf8zjCgWTtbdnHhfEkO3FmUiKG08n8OfA+u 7qEDdbPx12b8C1O9iPkLzSdFXylDJ36wyQ0v4G6gSBAErtA0WcohXP0lzRyJVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793625904; 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=zTXfjjXyIhTe74Prs8YcIQWc4lghdCK/1r2LD369J78=; b=uwYlztCOGGbipeL9dmjHle74NUHHyJtSXXus2Wp1lh218NE5v1n44yvi7PKsWiRDYMD0UD HNomhospL90CaqCB0NgFDww+Qx5FwVJW4BhUX1WJ1IYdBngkn2ZW4TBjXcHSoAzwCXMiDx kKXe1RCcKRdmX0KjoFHFqFqdQ8uLh7A1S6xUVCTSFrDVUhNK6UWSuohUZ3/yoAtBn0qeWD 9aLsPwECRFKTtK2zJ/RO7F+lLTqtIBCJ0WgCUGgjKOZhmuedP0/CwXgf3pDvcHQl4rEeHK lJgwz/OOhpOsXFi9xIC9G3IZ9EUkuiDIOOXBFwA4QhLwEElC6dCVJ5cKefLmPg== 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 4jJC9r5md0znmL for ; Mon, 02 Nov 2026 13:25:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35c44 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Nov 2026 13:25:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: af5313249730 - main - pf: don't leak transaction elements on error List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: af531324973021c5dc2cec47d0ef346666a4a551 Auto-Submitted: auto-generated Date: Mon, 02 Nov 2026 13:25:04 +0000 Message-Id: <6ae88f30.35c44.42ece4eb@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=af531324973021c5dc2cec47d0ef346666a4a551 commit af531324973021c5dc2cec47d0ef346666a4a551 Author: Kristof Provost AuthorDate: 2026-11-02 09:42:04 +0000 Commit: Kristof Provost CommitDate: 2026-11-02 12:40:01 +0000 pf: don't leak transaction elements on error If nlmsg_reply() or nlmsg_end() in pf_handle_trans() failed we did not call pf_trans_free(), leaking the pf_trans_e elements in it. Reported by: markj's Post-Commit LLM Review Service Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf_nl.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sys/netpfil/pf/pf_nl.c b/sys/netpfil/pf/pf_nl.c index ba9191745966..56b4d55fe0d4 100644 --- a/sys/netpfil/pf/pf_nl.c +++ b/sys/netpfil/pf/pf_nl.c @@ -3150,8 +3150,10 @@ pf_handle_trans(struct nlmsghdr *hdr, struct nl_pstate *npt, int cmd) panic("Unexpected command %d", cmd); } - if (! nlmsg_reply(nw, hdr, sizeof(struct genlmsghdr))) - return (ENOMEM); + if (! nlmsg_reply(nw, hdr, sizeof(struct genlmsghdr))) { + error = ENOMEM; + goto out; + } ghdr_new = nlmsg_reserve_object(nw, struct genlmsghdr); ghdr_new->cmd = cmd; @@ -3162,8 +3164,10 @@ pf_handle_trans(struct nlmsghdr *hdr, struct nl_pstate *npt, int cmd) nlattr_add_trans(nw, PF_TR_TRANS, e); } - if (! nlmsg_end(nw)) - return (ENOMEM); + if (! nlmsg_end(nw)) { + error = ENOMEM; + goto out; + } out: pf_trans_free(&attrs);