From nobody Mon Apr 21 21:15:46 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 4ZhJ7Q490cz5t3Tr; Mon, 21 Apr 2025 21:15:46 +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 4ZhJ7Q2x0gz3KMN; Mon, 21 Apr 2025 21:15:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745270146; 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=wOkBv6d/y7+QH+BmNa+xtdhhw0BEoBvJ+e8JUOsPRno=; b=QmWvcu2OY/0GxNSys9rYBboeNwhEKvRpXINL4vvlsBseawdvxfLBLpNUXKsrwtJS5Cic93 YLMxsN2E4qC4OgfjrtGvSgT3fABMC2ezCTQhCTQMUVIppEH0hFncbkbdt7suCoMKI0urNO 6lczWOvqpIwWft2xSL/fWEB5V6JtXqzmA1IqDsf/rvh6NupU8+h/Bka4v5KLEIRaHsETPJ 94KbE/hpykpINnf4DqcFcUDbkIAJmuCKppjKOXV+/zCK+luDBC7hnl0YgE25yEP8sCUhWK qmnNWaZwoIXulcMsR4BQuq6YddxBXcJX/Rhx7DM1Ckfosufvv8iqMD99YNhQ6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745270146; a=rsa-sha256; cv=none; b=NEYgEIW2PtP8pZKwAYdI880EWJ3VBzM0yXSP5QrGzH3KulNpjNPXEfLfloXfSwkhO0PZYd mdZow38aW+y3S9hoFOB4G5IOxAnGr0x3Qv4rqTM67v+ZJZcpFH9E3fTCDqfogBoA4rbiY8 GE4ZTa3ezXBNY6SW9BekuVbhoXE2+63YcHqTySzQZL3vSVAvBN8tV6SgkOXkgLXRYEx535 MFD8OnB1IdK+WB6GKT0q2LLnZt/6qqqtlZq9Ml6cmzS3MsQzxNTlTOmCvgbQmLO5A4l9K0 Yn0Ybpu2tZU40Hr6pxMO0b0x6n61h6xGcPaK+5RRUJvnmsUx4BLmGWmLeebP3w== 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=1745270146; 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=wOkBv6d/y7+QH+BmNa+xtdhhw0BEoBvJ+e8JUOsPRno=; b=HiDlSo82j6VllL3kdrRdx+Yzwa8Ts1XdQdlTJXy6r5hN46AsCRp1NazMKm0PnYD37uD/9a vg5CS3CfJzlCLZfdaFI3BF7mrNGxIi2FXngTsBikHcFjY2PMFce/gWCFM5f30hwDmG83Kn S8kfwb8q0XAmfYwVyhHVfrhNAcwKmHpxnGwYUhisqKQzBdMlUUbZSmC6lF72hV4R1SODqP hX0DYGhMTjVTX94hRufkxYYkacoBwszAypDSEY5FF0V7mF+w8TbvN91lQHP8pfoJqBO5cG S/fA8C5peqr2fUKY7Y+CSrJ8LK1pvg6QT8dwivVWs4+hJMpAeLWNcAovmjNC9g== 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 4ZhJ7Q2XgPz161y; Mon, 21 Apr 2025 21:15:46 +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 53LLFkix033435; Mon, 21 Apr 2025 21:15:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53LLFkO2033432; Mon, 21 Apr 2025 21:15:46 GMT (envelope-from git) Date: Mon, 21 Apr 2025 21:15:46 GMT Message-Id: <202504212115.53LLFkO2033432@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: 4df4b69530c3 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 4df4b69530c34122775ce77945002c745f395651 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=4df4b69530c34122775ce77945002c745f395651 commit 4df4b69530c34122775ce77945002c745f395651 Author: Kristof Provost AuthorDate: 2025-03-27 14:37:59 +0000 Commit: Kristof Provost CommitDate: 2025-04-21 21:14:16 +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 8306b400b1d9..1cf8d9b8e920 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -1567,6 +1567,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); @@ -4473,6 +4474,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, int direction, action = pf_create_state(r, nr, a, pd, nsn, nk, sk, m, off, sport, dport, &rewrite, kif, sm, tag, bproto_sum, bip_sum, hdrlen); + sk = nk = NULL; if (action != PF_PASS) { if (action == PF_DROP && (r->rule_flag & PFRULE_RETURN)) @@ -4485,6 +4487,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, int direction, uma_zfree(V_pf_state_key_z, sk); if (nk != NULL) uma_zfree(V_pf_state_key_z, nk); + sk = nk = NULL; } /* copy back packet headers if we performed NAT operations */ @@ -4686,6 +4689,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;