From nobody Mon Mar 31 14:58:00 2025 X-Original-To: dev-commits-src-main@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 4ZRDlF1Plyz5s8KL; Mon, 31 Mar 2025 14:58:01 +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 4ZRDlD4W1fz440C; Mon, 31 Mar 2025 14:58:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743433080; 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=ruqH09PO99kmVCR9ORdKj3c5Wqou/Ie0u0VNeCYBWhY=; b=RrZFKmK8xryhw32IDeP2OQBFUAuNsoHaHbmFAMb/HZ2DXSe5DmB1Nbb01tq5ztGNmcY+0X JS2qWPutppIfuyX9c4XQDBIP4aaCO05UvoqwYMxafxiLL+2bi1ISgo4YFLs0PE37VB6Oo3 URVrD7ig1KGb3pdGtaC2QJQoEKloQz1df4wqvRwvUZdeiluPdE8sgl4FRiHmhouE/Kwc8Z 8XUNAPz2i4LJwb4vcZuwY14MGsdRisAOagJcmutzt1wjWt9eO8xwwPXhfRaouDMqXRRMsf 4Q7KoBHxCF22rhvlFqa60m6sQ1/yscPeyNHn4PsVsLoJcZ2AODQ4TGuVQmIkEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743433080; a=rsa-sha256; cv=none; b=feZYe/iVZBRyCfY8jiQZvg8hPR2o+Fs2lDRyoFLLHtP6975Igv7MLt0dljlaesmkjAucol DrgWaern7rj3cEwO8YwMDpaecf5MckdbYCOAl40AcuVQ6yCLWIpzcua7pTploiOmK4ySVz rGelxxkae+C7A75OICsOTkUiKM9QlfToiyV7HeueXXkoz248k5TMdlDFob/mm8Gh3/7BuH p2IeqBRdmo8LVp5UNnmPaG0204A8sUx9d7LOwW0T2FnnjEz3iPDiXpkHPmXCrbc/IBOLNu LhjalLFKJlj4koVdKSgwdoEtrFtzk1Plj2Kt6LHinId1RxmOJCxWwhQb8jitSg== 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=1743433080; 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=ruqH09PO99kmVCR9ORdKj3c5Wqou/Ie0u0VNeCYBWhY=; b=sNGBQW0ZWlzGF1xYTe76ygbwDkmxeoudQOJB4M4By9fPDzdnlwsDQFOtfQb8VPeWzlNAnC NAc8zegi/JkMuS2aEf9G8g+VKfAREAvV0xjjceNj8ZhkK1Thz4abs3+o6iQgwrrXev47sm mehelNlk+JgklqKQeCt2sspkYYPBm7w2vlQQJm2Pkys8Ea6O71x6LwtO3L0U+BlZFkE2z3 CLvoIs7JacUqcrM/Pygtge5Tkq+A76vkZIO8J+CaigJ3quCcMIuptwQ9TkLkAKrJ3ZwucP ZBZkeprQmUH7x+uzoY13ZR+7uza+cJVFt51QwenO7UlmPbL0AowqDdBng2CPSQ== 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 4ZRDlD46Lfzqb7; Mon, 31 Mar 2025 14:58:00 +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 52VEw0MA038066; Mon, 31 Mar 2025 14:58:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52VEw0r1038063; Mon, 31 Mar 2025 14:58:00 GMT (envelope-from git) Date: Mon, 31 Mar 2025 14:58:00 GMT Message-Id: <202503311458.52VEw0r1038063@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 592418343348 - main - pf: explicitly NULL state key pointers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 592418343348bcf4355c249f53cff89ed90ea1f5 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=592418343348bcf4355c249f53cff89ed90ea1f5 commit 592418343348bcf4355c249f53cff89ed90ea1f5 Author: Kristof Provost AuthorDate: 2025-03-27 14:37:59 +0000 Commit: Kristof Provost CommitDate: 2025-03-31 12:56:43 +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 --- 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 c75737f688b0..d60b30057cbb 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -1835,6 +1835,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); @@ -5969,6 +5970,7 @@ nextrule: action = pf_create_state(r, nr, a, pd, nk, sk, &rewrite, sm, tag, bproto_sum, bip_sum, &match_rules, udp_mapping); + sk = nk = NULL; if (action != PF_PASS) { pf_udp_mapping_release(udp_mapping); pd->act.log |= PF_LOG_FORCE; @@ -6017,6 +6019,7 @@ nextrule: uma_zfree(V_pf_state_key_z, sk); uma_zfree(V_pf_state_key_z, nk); + sk = nk = NULL; pf_udp_mapping_release(udp_mapping); } @@ -6234,6 +6237,7 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, goto drop; } else *sm = s; + sk = nk = NULL; STATE_INC_COUNTERS(s);