From nobody Mon Nov 02 13:25:09 2026 X-Original-To: dev-commits-src-main@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 4jJC9x6LMHz6yLxK for ; Mon, 02 Nov 2026 13:25:09 +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 4jJC9x1tLmz3NWV for ; Mon, 02 Nov 2026 13:25:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793625909; 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=GPXXfaVOcLKHNp4TAclfMXkmTYZESeK4Kf7cBXkA1f4=; b=nGUYeLM8W+g4ogQkCm6PfO6+oxvbHbnBGB7O9Qm0zUE/ReUsDldjcXNH/8wree9+LiJIzS eiCNYdZbA70CQIcK7yc/NyCodvM8IeyxcxlL77g0WoXuDG4SOXtqwTX2mIjCJxJebrgLMf WPdcJMVg0CYyxJZXHrgf3g4/cinTqUP/fLYIZeHc+/fRxukTM45FinXKzbTPLKJiy0xGEU bG2N+/iRBj5RcuwOwfy8KI9CN7Yu71aePI0YThNwPXZBAAIH3TnD4doBtv4e2fU2YSaGd0 cTjtYUUXEE6/SktCSCVEtDx4I9tzDtctyzJKG+uXpyZx8vuuCNgItmE/cbcnSw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793625909; b=oKRfVfBLh24TP8osq/rWL5u7B4K73M0NidjztFN5IaVDSiLoVxd33CNPKw4ucjXxA7Cv5J qkVmSWnEI/mWgvyOA8YOI7rOcXDsuWLRsDWJqchhSKg2aQwaoEuk4Y0s8TdQkh2G6LJqvG aLa3isg3YHYspPgcyvkEbgm8q+4R01pj0UmHNT1k1Hsx8KF8pPWZIWUWaPoHPKCvviEs7q 3PxL2Ty4NfskT11pnoZJSMjunm89neXu3ktgBPphen1RJ0XmQgjgby9Zz2Rld8CC8m5l2I Fnt91E9xCN3tJIUmtSOzot+4QLlF0N75Rwdtg3xvIpT/zY3kpiphJtMpavtDLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793625909; 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=GPXXfaVOcLKHNp4TAclfMXkmTYZESeK4Kf7cBXkA1f4=; b=Vo/EIZsZexfc8RQB5X4DnVl2D9+vixzrk+S8CGAiIALsNEAo8n5K9Msa4qifwThJ2hFAu/ CfD7c6MuhZwV74i2aWjst4N/1UjTaRnGU409eD4mXX+aFQeRxFHo3iVeIcwe2wV1Phnt64 5OHCRDG9vC970E47EB7iMrEnCUmQ8GKqLST6bNr/ItCnR72QHICMrSyIGkMzemH57Lmtat 5GwrNDZQdZVmkJ4v59QoOfSNrzYUMQOnHGUksXpouFWVWxuPZPuxgLH/2H+SDm26TVN8Rv nheRqXyKXph+rGArmb5eBHfTWLrS+9s5L4WjFLNzSrBu6ybjeLKUpVVdq4K6vA== 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 4jJC9x1PgGznkC for ; Mon, 02 Nov 2026 13:25:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34931 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Nov 2026 13:25:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 73bd8d4bf618 - main - pf: fix DIOCXBEING/DIOCXROLLBACK/DIOCXCOMMIT error handling List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch 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: 73bd8d4bf618a5d6f4a2aa7f5237af3a5d8c1ebc Auto-Submitted: auto-generated Date: Mon, 02 Nov 2026 13:25:09 +0000 Message-Id: <6ae88f35.34931.13e0d01a@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=73bd8d4bf618a5d6f4a2aa7f5237af3a5d8c1ebc commit 73bd8d4bf618a5d6f4a2aa7f5237af3a5d8c1ebc Author: Kristof Provost AuthorDate: 2026-11-02 10:19:31 +0000 Commit: Kristof Provost CommitDate: 2026-11-02 12:40:02 +0000 pf: fix DIOCXBEING/DIOCXROLLBACK/DIOCXCOMMIT error handling - ensure the anchor name is always 0-terminated strlcpy() won't overflow, but will walk off the end of the provided buffer looking for a 0. - don't overwrite the pf_begin()/... return value with the copyout() return value - stop on the first copyout() error Fixes: 2636cc0414fd (pf: have DIOCXBEGIN/DIOCXROLLBACK/DIOCXCOMMIT use the new functions, 2026-10-27) Reported by: markj's Post-Commit LLM Review Service Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf_ioctl.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 3dda0a17754d..36308c466843 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -6392,6 +6392,7 @@ DIOCCHANGEADDR_error: e = malloc(sizeof(*e), M_PF, M_WAITOK); e->rs_num = ie.rs_num; + ie.anchor[sizeof(ie.anchor) - 1] = '\0'; strlcpy(e->anchor, ie.anchor, sizeof(e->anchor)); e->ticket = ie.ticket; @@ -6410,10 +6411,18 @@ DIOCCHANGEADDR_error: break; } + if (error != 0) { + pf_trans_free(&trans); + break; + } + i = 0; TAILQ_FOREACH(e, &trans.elms, entry) { - error = copyout(&e->ticket, &io->array[i].ticket, sizeof(e->ticket)); + error = copyout(&e->ticket, &io->array[i].ticket, + sizeof(e->ticket)); i++; + if (error) + break; } pf_trans_free(&trans);