From nobody Mon Nov 03 08:38:59 2025 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 4d0Q3l3vpFz6F9DM; 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 4d0Q3l352Mz3kWX; 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=NBfDmw79ePbRahYjIyHBcWj6Xr7nCxD1BgvT2CJfAUc=; b=j/H+QDFclfxQhZVlfsRoXx5cGOgc0L2qPEsuNcxwojqCt4IUY4f7cuOSTbwiy7sij4DGhJ ZX1y0cXYG71SAMGRVCspaHImJu0+1zZS0JAS6arZypo6zG5C4B4ANKAosAe2meh5WsS3UV Miv/YO4mytEPD1nWEKnkTj2AsPIaXaOjx1ipKJ4ALQL794uUw9QFso0cDkiITsLfBCJTlm J4g+7zCOSl2vSSv3dwHTYRdR8UboSfeqRPMTRwms/DLbJvYQ5TChG51y6zxlIZm9+RLle2 RkiRq9bFlT8DQ00qM+q7avv70cE/wbTd0H8ebKPYnqz3dzPinMtaSynFGNoODw== 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=NBfDmw79ePbRahYjIyHBcWj6Xr7nCxD1BgvT2CJfAUc=; b=o6QQ9lezf5KmGmzhlNkk1FRfOziHrg13JAxec/SUGwdSVfhIoGmX5WbIaJWzfHYAWikf6W rArC0Hg5FgS/CaKxma/rU5pKuzEni06QYdrb/xxTll42r2UJw24NwIzU92tuYWDzkuiZFN DyVDmo5pw/6QWJ19WEAD0b8o9TAcvxsu/o/KH/+mDZMvyUaj3SBbNuwCn7LDbmdWlG9yZX Y9SJRum8skXsLylGkMbUbhAEWfTwAIczGJ97cH7yjPgRLxmqnqAbnt8vTz38FbG+LXQ+5X ft6UO7JmHURmhMjpiNI/qBMIxS9mvbygPOaSNX5bpi+wbDp3tMUyXqPmNMGI1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762159139; a=rsa-sha256; cv=none; b=f79rlFLSBnAI60DutITeODljGTRGWdl8dZyX1jsiO2w/n2O8zi+zMZxpG+cuXuXFvBmiE6 i0xRr7qkHMlvDjzLFpF2zsKjB/1alVRZL8vysRO/7sXwej+cGE1c0pycUnRwvO1q62zadw s/ZtMB7FMTnpdhHFwSsPwCcSzUKufC4LR2EKGBUUH3CG6D38wU4RVMKzRf9tfIp4U5C9Cj /cntFeayYfYAYxJIN1pKRmp8mJkC4mjrUT/Vb3EiFl8TYUPFuXISchqRmG0qDCmvpmr+6i uj2eS+Ce7SEFWlK9e6RuVdiulgdqNH7FqeEcT7lty/D2AdYWFGb6WzYS/Nvxtw== 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 4d0Q3l2Ldgz13v0; 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 5A38cxBo016276; 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 5A38cxw8016273; Mon, 3 Nov 2025 08:38:59 GMT (envelope-from git) Date: Mon, 3 Nov 2025 08:38:59 GMT Message-Id: <202511030838.5A38cxw8016273@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: 4891e6f1c0ee - stable/15 - pf: improve add state validation 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 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/15 X-Git-Reftype: branch X-Git-Commit: 4891e6f1c0ee9d81ca36b9d74d8ef4ef20690621 Auto-Submitted: auto-generated The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=4891e6f1c0ee9d81ca36b9d74d8ef4ef20690621 commit 4891e6f1c0ee9d81ca36b9d74d8ef4ef20690621 Author: Kristof Provost AuthorDate: 2025-10-29 10:40:52 +0000 Commit: Kristof Provost CommitDate: 2025-11-03 08:28:53 +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 66bc99df2afa..de69ecbb0985 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -546,6 +546,9 @@ pfsync_state_import(union pfsync_state_union *sp, int flags, int msg_version) PF_RULES_RASSERT(); + if (strnlen(sp->pfs_1301.ifname, IFNAMSIZ) == IFNAMSIZ) + return (EINVAL); + if (sp->pfs_1301.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 18fafe11c6ab..ff3f1bbcdadc 100644 --- a/tests/sys/netpfil/pf/ioctl/validation.c +++ b/tests/sys/netpfil/pf/ioctl/validation.c @@ -928,6 +928,30 @@ ATF_TC_CLEANUP(natlook, tc) COMMON_CLEANUP(); } +ATF_TC_WITH_CLEANUP(addstate); +ATF_TC_HEAD(addstate, tc) +{ + atf_tc_set_md_var(tc, "require.user", "root"); + atf_tc_set_md_var(tc, "require.kmods", "pfsync"); +} + +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); @@ -953,6 +977,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, rpool_mtx); ATF_TP_ADD_TC(tp, rpool_mtx2); ATF_TP_ADD_TC(tp, natlook); + ATF_TP_ADD_TC(tp, addstate); return (atf_no_error()); }