From nobody Thu Nov 06 23:11:53 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 4d2dHY4Y8Mz6Ft6V; Thu, 06 Nov 2025 23:11:53 +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 4d2dHY2DN6z3h0C; Thu, 06 Nov 2025 23:11:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762470713; 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=+vJ5MpMBVgDI+qFZF/BxL0pW+nRJBZGO9k5uB/X50aA=; b=BG2hfkJAgl4J1HrXRgP4vlXs8kbkCdr8lANinGJibhB/rxBAPLxrL2L4y7yxjCAqzNnPLV DbS0MLsBLIeSfhaku1ffq48Qekrooy2AoFMM+CGvhoeD2op7uT8XngB6kTxVdUOO1c4gTe 2Yvj1GLE00Vh3Dsm327BBC2luzOMbciUmCuu282TbcLDzcoPJxlEl8D+ezWV2O0K9tHDlK Dw8QD8waXI9c0ZPRxx2RQzvSPiPo7MvkuMzAeU9nctpjQcxY1qjZpl3B6zp8AQZYTnkOmZ RpEeshiw8LiexA/Dwczwazck4zRmLItQ0TSYPX5S7TE+BUVOsGYz0pWIltQ08Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762470713; 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=+vJ5MpMBVgDI+qFZF/BxL0pW+nRJBZGO9k5uB/X50aA=; b=k3+5cmmL7W/rp4lP1ch7YYeyUShdYaXIk3jt0bHqMzVF9/eXg56AOmMTc19J+NmJqP7ssx eSiU+/nTYbtSwvlScKd2edZxwpDO5TH1nrPQrC3xC41r2h6oG5dX/RZYqJ+FXHxUFu8zNS dWYIGUd4O8LMVz79dbccFSLqlNdVI/Ee9PbP2jAKWjeFAS2/vyzOS0ESk8LnPSnjJuwcG8 Y0nRXpM44psAgep0k6CCMrVvbBLCLOW2ywHZm/iZNEEFIF/MHLXzUD6XE7+05sHV2GM54w +4NcVyFvJeO67WkBbayAvIOqMLgPC+HbqY4SVNuwekzRqA7LeAPFthzhHtv0bw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762470713; a=rsa-sha256; cv=none; b=lGA+DyR8VxL/uAYJ7fp7BucQvebJ0TgQ9zxLVxEeqAB/gn0cieeBFIfL+GeD5Lkz5gClbo oIvM6eHwRSTWqxqcD714R55Sx4h+2MC12HCLT48+fsxsAKjKG6irzwDVfKi1PZFc7bhycg +b6VuK3KD3eixWPqqL4WNaTn9pB0hgP7HoJPTBDBEHMX/lej/tSCbjbGWldh+6QQuK7Q3R 2Dd7j4047fMlxNjYZe76Rgw2xjbuQ0NdEUcEa1qNpS19HsCrq88zNMaZZqMMIaGEewA+3C LCcsX7SgVzSLOwCwMPVzCH3Qag4/EnWUBCNPkeiihbjOXv5kZSmnA93CxzXXGw== 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 4d2dHY1ggMzbCJ; Thu, 06 Nov 2025 23:11:53 +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 5A6NBrIQ010437; Thu, 6 Nov 2025 23:11:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A6NBrXJ010434; Thu, 6 Nov 2025 23:11:53 GMT (envelope-from git) Date: Thu, 6 Nov 2025 23:11:53 GMT Message-Id: <202511062311.5A6NBrXJ010434@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 05c3c8c0aba3 - releng/15.0 - 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 05c3c8c0aba39362d88b76ea22ae80328bca9c13 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=05c3c8c0aba39362d88b76ea22ae80328bca9c13 commit 05c3c8c0aba39362d88b76ea22ae80328bca9c13 Author: Kristof Provost AuthorDate: 2025-10-29 10:40:52 +0000 Commit: Colin Percival CommitDate: 2025-11-06 23:11:02 +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. Approved by: re (cperciva) Reported by: Ilja Van Sprundel MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit faacc0d968816cf8714c974b6d8df6191cfb0e0d) (cherry picked from commit 4891e6f1c0ee9d81ca36b9d74d8ef4ef20690621) --- 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()); }