From nobody Mon Nov 03 08:38:59 2025 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 4d0Q3l5qMGz6F9wH; Mon, 03 Nov 2025 08:38:59 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0Q3l4zLcz3kVM; Mon, 03 Nov 2025 08:38:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762159139; 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=lYYt3DboVTey0SfLEKbTQvxDlLR2Nka/59ExiKQPPVA=; b=QlnaFsT14w2NkLH+3nvpFi+PiWoZ0ICcxeHHMF5Grn2+0KfErxfg9oFzB3TbRC+OjtB+2V ByUt6iRZ/UGvDkGnUgGi7ujjFMMlf24gG6f9igCCM3xBcjespz4MiCgl1tKSEtJJqegyw6 QTP8h0nB7CSHVloppbq+M1P8a428GQqu8jhLBQqayjgy6/6yGLWLzivnRwIfc/mAylD3P2 P6Q0Qkv9HwQsU5oPORRnTorr9Pdv99ZYJkJ6i95z9OHc9tBmZaq/HLkUtDDLRHUzAJysZc qnfVjMpNCn95I0NtXOZPv+7yQnZKFAmV8fzoSDCYBDawS/6f9YdgZijJad7pmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762159139; 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=lYYt3DboVTey0SfLEKbTQvxDlLR2Nka/59ExiKQPPVA=; b=xs4Ww53p4KwuXq7ZPnGUcGVlvBhP0sb5lSPTnJ+rSEZH7jE/9/ioOMMM4rnSYUthGWFhSn e7zqYxWcrG0F4QBSW1R78DujR/gXVogpkQrKMm/K3Scl5289Ug2J9rjCYYMPMaZHohkyc9 90rkXdZbHGZz1KLACuAbOlxfFXLCELi4EFshzIeHKX7m+7HUTRyDsATR6NCbtppF5Fvg70 r7noM7M7JtUWB+8qhZANzPBPB2p0tei/81bi+PBx4J+OsIMbhNmOC/DrJRFs64e8ZzwG1P VjQSGF13JzM6EXeD+0povYZ4wgcXuyz1pE6nwQG5dhY10m0WSYReS3Ezc110GQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762159139; a=rsa-sha256; cv=none; b=v+x/RZxDX/Ou/sf0eyMg70h2eExFiWncj2xbhdeaIeHEDDed5ErJjsF00fYXe6IEYIcCd7 9jbqcsl0qHsxbUoBNKa0cf0J4GwBXcFKF2MuXHCln15AZGKkvAf2510cCgCJM/Nmbk5Uou RR/7sey3YAxVGTAn9/oUXWc0fgq2fGjN4LjrexHgKYO19f3oUpvZtYdSs97tft5Or+B1tP C8Y/s2u49+jjje5imZ1wM8dBvsVcuGHzgzolADDO188nirY5Qd9RW12AVBeWKFQ3CuUIeZ QxoE/MOWhR8BemKQvkYMuTySMgymmVyJG7nenpsWxUT0lz/8GoE9eJ/A2V2JGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0Q3l4PnCz13XV; Mon, 03 Nov 2025 08:38:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A38cxLH016366; Mon, 3 Nov 2025 08:38:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A38cx4H016362; Mon, 3 Nov 2025 08:38:59 GMT (envelope-from git) Date: Mon, 3 Nov 2025 08:38:59 GMT Message-Id: <202511030838.5A38cx4H016362@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: ba198fe8a03b - stable/13 - pf: improve add state validation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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/stable/13 X-Git-Reftype: branch X-Git-Commit: ba198fe8a03bbe1e11efcd651d7ef7c83837efbe Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=ba198fe8a03bbe1e11efcd651d7ef7c83837efbe commit ba198fe8a03bbe1e11efcd651d7ef7c83837efbe Author: Kristof Provost AuthorDate: 2025-10-29 10:40:52 +0000 Commit: Kristof Provost CommitDate: 2025-11-03 08:34:26 +0000 pf: improve add state validation Both for the DIOCADDSTATE ioctl and for states imported through pfsync packets. Add a test case to exercise this code path. Reported by: Ilja Van Sprundel MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit faacc0d968816cf8714c974b6d8df6191cfb0e0d) --- sys/netpfil/pf/if_pfsync.c | 3 +++ tests/sys/netpfil/pf/ioctl/validation.c | 25 +++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index e071197f17ce..c43cb59d8705 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -475,6 +475,9 @@ pfsync_state_import(struct pfsync_state *sp, u_int8_t flags) PF_RULES_RASSERT(); + if (strnlen(sp->ifname, IFNAMSIZ) == IFNAMSIZ) + return (EINVAL); + if (sp->creatorid == 0) { if (V_pf_status.debug >= PF_DEBUG_MISC) printf("%s: invalid creator id: %08x\n", __func__, diff --git a/tests/sys/netpfil/pf/ioctl/validation.c b/tests/sys/netpfil/pf/ioctl/validation.c index 1ce8999dcb91..152a9678812b 100644 --- a/tests/sys/netpfil/pf/ioctl/validation.c +++ b/tests/sys/netpfil/pf/ioctl/validation.c @@ -32,6 +32,7 @@ #include #include +#include #include #include @@ -894,6 +895,29 @@ ATF_TC_CLEANUP(rpool_mtx2, tc) } +ATF_TC_WITH_CLEANUP(addstate); +ATF_TC_HEAD(addstate, tc) +{ + atf_tc_set_md_var(tc, "require.user", "root"); +} + +ATF_TC_BODY(addstate, tc) +{ + struct pfioc_state st; + + COMMON_HEAD(); + + memset(&st, 'a', sizeof(st)); + st.state.timeout = PFTM_TCP_FIRST_PACKET; + + ATF_CHECK_ERRNO(EINVAL, ioctl(dev, DIOCADDSTATE, &st) == -1); +} + +ATF_TC_CLEANUP(addstate, tc) +{ + COMMON_CLEANUP(); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, addtables); @@ -918,6 +942,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, tag); ATF_TP_ADD_TC(tp, rpool_mtx); ATF_TP_ADD_TC(tp, rpool_mtx2); + ATF_TP_ADD_TC(tp, addstate); return (atf_no_error()); }