From nobody Mon Apr 21 21:15:45 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 4ZhJ7P58SBz5t3Zb; Mon, 21 Apr 2025 21:15:45 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZhJ7P3V8qz3KGg; Mon, 21 Apr 2025 21:15:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745270145; 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=zq8HKffLEXrkZF6uqI6EuIDdT40dSQ3Jem4IrG2COoM=; b=WiSTX4K0x+uroDXTSuM6UhMgRWoN2d4pMklyYTdBS/kSlRaGqiKlyLRSUQNJtFdbX0kgbE /xH3KvfhHzAYOi8wkqHcq+mfhth9UXFaFffRf5fJXQpw12lD5BWOmTMmnWhEN7rjGiyV6w cIGlgDhlrhFZN2luD3iE600CDhhOGAYKpYzs6xzxHjiDRgyTZRAXIr82wtCNwQ1dhbkojv iRntLTqF2po99d/ST5h1o80cZrwGluDCgCpHKBy481IKR34hqKZ3DmiJZqGGYTxQ1wWFu2 dSZiKK5tpO/YVBq+afF4UDEujw8OBZtT0PDY67y9ypHbXnWalkMZJ/hXZoJjzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745270145; a=rsa-sha256; cv=none; b=m0wz9MPWWKoaBeiX3wvVx7Qrfs6JkZGm++YatQyLnkHPicKM6OVnajeK+jWhlEXSodLOX5 JmJSiH4XplSmJU0y/Ac5swQeRNr4d6VLHVRhoiCLJhX+FIaMl96GqekKdf3j1UIZII8e2Q hOjxLoESahMXkX+PvkUu+hf8rgeCpP7PinLQbZb7vqVI9klngXAp62rKGTX2PjobHzAAab YDqd/B/+vvIYQDZOak5PBIVzbQwc4smf1QueMMdS/sY7gQWrRwVOXj23ila7bPegs5HHxK mQ+jlfnpyjYpBmxISjKjlyCAvLsUsJ5FCmsNtm0XjO9d4SeOJWhLmuU4xvl9EQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745270145; 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=zq8HKffLEXrkZF6uqI6EuIDdT40dSQ3Jem4IrG2COoM=; b=C0JeYmFSR+APLbu/2RiAlwvcnEJQtZHpHjJGDp/Mlot0/PbwGlrtc0OpNMRgs4e18pxM4v XdxIwLV4i0tfNeg2UncRQmBn3WMg/tMSRm8QvR28ndCMcih55oFQ1AQV3kakG/Wjb5AdHK 6TtRnwQwT88g2d6eFKLFjArSWgsTyAPo+KvKNM84mD4nj/JXFll+hPeBJoUtuhOaPOFMvv vHwlLP1suqMdsgKbJ9Ydfj1nFOwYU8IzVWlF3G19EQ0ARWV36nPJVw77Gox+qEIdjK1SQW WYUel4KwmufN/m2xxjtwa9ICYbWwoN4rPFNiIKK5nylMAUIjCuRedHHCBnbvIw== 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 4ZhJ7P35Zrz161x; Mon, 21 Apr 2025 21:15:45 +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 53LLFj4f033401; Mon, 21 Apr 2025 21:15:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53LLFjcP033398; Mon, 21 Apr 2025 21:15:45 GMT (envelope-from git) Date: Mon, 21 Apr 2025 21:15:45 GMT Message-Id: <202504212115.53LLFjcP033398@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: b89bc49a6348 - stable/14 - pf: explicitly NULL state key pointers 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: b89bc49a63483bdb0617c2fcebeb2faf2565e994 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=b89bc49a63483bdb0617c2fcebeb2faf2565e994 commit b89bc49a63483bdb0617c2fcebeb2faf2565e994 Author: Kristof Provost AuthorDate: 2025-03-27 14:37:59 +0000 Commit: Kristof Provost CommitDate: 2025-04-21 20:25:46 +0000 pf: explicitly NULL state key pointers After the pf_state_insert() call we may not use these pointers again. Explicitly NULL them to ensure we don't. Also NULL them out if we free the keys directly. Reviewed by: glebius, markj MFC after: 3 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D49553 (cherry picked from commit 592418343348bcf4355c249f53cff89ed90ea1f5) --- sys/netpfil/pf/pf.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index c74d2f5efadb..8201d3e24db7 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -1629,6 +1629,7 @@ pf_state_insert(struct pfi_kkif *kif, struct pfi_kkif *orig_kif, /* Returns with ID locked on success. */ if ((error = pf_state_key_attach(skw, sks, s)) != 0) return (error); + skw = sks = NULL; ih = &V_pf_idhash[PF_IDHASH(s)]; PF_HASHROW_ASSERT(ih); @@ -5064,6 +5065,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, struct pfi_kkif *kif, action = pf_create_state(r, nr, a, pd, nsn, nk, sk, m, off, sport, dport, &rewrite, kif, sm, tag, bproto_sum, bip_sum, hdrlen, &match_rules); + sk = nk = NULL; if (action != PF_PASS) { pd->act.log |= PF_LOG_FORCE; if (action == PF_DROP && @@ -5081,6 +5083,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, struct pfi_kkif *kif, uma_zfree(V_pf_state_key_z, sk); uma_zfree(V_pf_state_key_z, nk); + sk = nk = NULL; } /* copy back packet headers if we performed NAT operations */ @@ -5294,6 +5297,7 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, goto drop; } else *sm = s; + sk = nk = NULL; if (tag > 0) s->tag = tag;