From nobody Mon Nov 03 08:39:03 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 4d0Q3q5zWpz6F9qx; Mon, 03 Nov 2025 08:39:03 +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 4d0Q3q300Qz3kWw; Mon, 03 Nov 2025 08:39:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762159143; 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=NaMq+U+hlRXfP9Yvj9ctmehou0is1nP6aDrV4lwMO+0=; b=OqEv0UGawR66jEZi+bVIE9S03XJZPRJoXSs3Q1P/YrJFWi/LKKlCmHl1ZerFC4EG9zX3q4 N+Cx9+MxDWNLBl0myMmxmy20Oc7pCyDLyd+jB84EZXybhyR/R80YQxpuSICheSKODZ3HEI 6ToP6Mxo+Mxk8dR/UK/2bg+/4j82lCQtcm5zCN+HwUkLzPT4uUBhZ6BkSVg/07/IIYtY5D Y1rl4U2Hshb2RoqKMmyaNCPgG4ixjNKvu0ih5qZe0wDAyKPsS4gL3nFVcTmpSxi5o2vXpc 96DyfeO6eSddE3Nm7BxZThGsutf/JgTVxSRIJ1aKqKj5ebMG2QXUeIVFDJMDUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762159143; 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=NaMq+U+hlRXfP9Yvj9ctmehou0is1nP6aDrV4lwMO+0=; b=mtkogXeTGSC3TClcWvtOUJvoRJJz4KveFrgrCYRRkrTp9w9Synokhum8G75G0Oj5lBz8UM kAEwjyeMETLKH4v3wskkjsClzj624+GOIMnWAR41PA5X5nq/jRFxNa+OCywv6zNAtIIDMv +ua+FUsSLkLlWn1BVRKIOFIP1AAGkr01jQbTniq33GRbPf+aIdzGMH7EwNasPHn0j4KQsd a6+bN4O3kWM1cWGWeNvoq7w92c7Dehji+FU45CU/szJVJhalycokp4txVHKZvqcC+Iu8/V WghkAVXkr8OuOSkIwCsAnreUe5zibOLr1YPXksKuKbYMwQA7odrwvP3yCXGJow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762159143; a=rsa-sha256; cv=none; b=tlBjnYfjTwOmcv8j+rB8bA9T+oXI7ps6lwJZ21hKMtCbsxCtT3WTrad9yV3q9J56KFhr91 EFRtJnEAXlXo82F/pKiC/AGAhIA6QM2KrzIgWW9BWASQ+XLp7RrEwbZN3njm225fctP5ZU a9a1ZnD7Qj+qzB6VZvNT0ydl92Fh/9X/Z5l6turx59kbu+KByTW/jWbtwyh03D6YS3aSEV XFNOQoLqL5c9og17Ko5dhNd02gkrSYiFidHlVUqM2wdeHIOyCa9dNuIr4aEXasOHyRdhi1 np02QFkyjvfPBkXvPrAJx+FlNkPv5DojvIWkq1mvhvbzVbj33j334engV51LcA== 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 4d0Q3q1tQLz13xT; Mon, 03 Nov 2025 08:39:03 +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 5A38d3Xi016611; Mon, 3 Nov 2025 08:39:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A38d3nv016608; Mon, 3 Nov 2025 08:39:03 GMT (envelope-from git) Date: Mon, 3 Nov 2025 08:39:03 GMT Message-Id: <202511030839.5A38d3nv016608@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: 70154de06926 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 70154de06926aadf7efb50591e21a82aaf1b619a Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=70154de06926aadf7efb50591e21a82aaf1b619a commit 70154de06926aadf7efb50591e21a82aaf1b619a Author: Kristof Provost AuthorDate: 2025-10-29 10:40:52 +0000 Commit: Kristof Provost CommitDate: 2025-11-02 14:06:44 +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 | 26 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 8c080b472653..2a5cb0612d36 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -530,6 +530,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 1ce8999dcb91..b18e30e5e6af 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,30 @@ 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_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); @@ -918,6 +943,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()); }