From nobody Thu May 04 16:24:02 2023 X-Original-To: dev-commits-src-all@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 4QBzfB2l6nz49Gtg; Thu, 4 May 2023 16:24:02 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QBzfB2GkPz3qYN; Thu, 4 May 2023 16:24:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683217442; 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=k0NFI4u9oOKFmb7O1IEKDWw/cObhSyBpTbaj2SUAdp8=; b=JA7QbGaNIS4X/ypL1Lr7LzCpsRUKQ3YK9e+6iJvrugc6pOEzNIHsLHFYLD5SmxmyYr5DhX 1afxdHL6t72OAQiP7K8qjUqTf1WBbdjabOW2Sb0a7D1A9QBWigGKJk1T/kszUdiXliErF2 fbj6aOvCKt01/0P/JYKrY6wm12dNMOBi3zgwMpeyon1dezajn0myG1JomUjQQSGTanXr+E mRVfh6ENnCiigTzsP7p618RZh+SoNskPuKfw0t2Jao6ReGmbmvHFRJxrtZeviuq0LWs+tz fbH4+oq1tE1aaGRfc/XA223JoAxtYmmVqC49wBu86gOveba55TsIfM79dtXyiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683217442; 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=k0NFI4u9oOKFmb7O1IEKDWw/cObhSyBpTbaj2SUAdp8=; b=orjFHIciCD1q9Tahxux9BSSPzHZqA3kkkidkgYq9IAyheNDu+Ouv/qMfl5dTrUPfB2aAWV iYM7pGHLMt13q6u8PHrjHCoeFnD+9G5XEOYn94IYHsQn0jsAuPmV19rw/vBJjaV3g4ANpt 3Tx4WG/QjKLavAKWXR+tqh1SX7zy7wlIQLWNAdfMH6DTTOno0UmYafmzJH+ElihGambs4a q1BIEgIU4jHkX32ZFGhPL0qFqVKgesRytvVwUPNH545OWOhFy2vsAksHh+M4cebiSyRU4i 7OAbGZoIBQICApqO7UJeyFQmC6UznpQwgnzRiUJpO1VtK6ycDsBb6wGuJFKigA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683217442; a=rsa-sha256; cv=none; b=l3SYyTzmnkmt8WIIxtOyMsL/LIp5Om8ilFXfWXKSp0tLeavhCBltCD6viJVAC8C5ljvWxK n+tHVrChNtP6HJOqPoHc1BhsNGEVyix1TtSXwJcLUGTDO/C1zu3kmlDoA4e29k4Yo3faUR r+GrVgU+/LDcE64dn/nswIFOby2i8/QaUFgRERCgUVxjU+BCA/4xnLDHkLOIHZ/eDbpTm2 KDEBPRsmM6LKeZmamX82vAOYA7hZRL9XP5CcbOxtqPfSrIhhbgJEvV8xHUf7/EskO/ApCk CleFZuyX9/3mysCbuiNAcVpsI/hKCVK2OuG4iHa/L38QAVBI3VIQ9JL2Qe5VKQ== 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 4QBzfB1L7yzJdq; Thu, 4 May 2023 16:24:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 344GO2u0035535; Thu, 4 May 2023 16:24:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 344GO2VP035534; Thu, 4 May 2023 16:24:02 GMT (envelope-from git) Date: Thu, 4 May 2023 16:24:02 GMT Message-Id: <202305041624.344GO2VP035534@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: bf206a1db26e - main - pf: remove NULL check before uma_zfree() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: bf206a1db26e44180466ea2258a2b82467ffb99e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=bf206a1db26e44180466ea2258a2b82467ffb99e commit bf206a1db26e44180466ea2258a2b82467ffb99e Author: Kristof Provost AuthorDate: 2023-05-04 15:20:02 +0000 Commit: Kristof Provost CommitDate: 2023-05-04 16:22:54 +0000 pf: remove NULL check before uma_zfree() uma_zfree() can be called on a NULL pointer. Simplify the pf code a little by removing the redundant checks. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/if_pfsync.c | 6 ++---- sys/netpfil/pf/pf.c | 18 ++++++------------ sys/netpfil/pf/pf_norm.c | 6 ++---- 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 2bf1146ceda8..cf9a50a7020c 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -649,10 +649,8 @@ cleanup: error = ENOMEM; if (skw == sks) sks = NULL; - if (skw != NULL) - uma_zfree(V_pf_state_key_z, skw); - if (sks != NULL) - uma_zfree(V_pf_state_key_z, sks); + uma_zfree(V_pf_state_key_z, skw); + uma_zfree(V_pf_state_key_z, sks); cleanup_state: /* pf_state_insert() frees the state keys. */ if (st) { diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index ee17df0c866f..1424099b1e5a 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -4541,10 +4541,8 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, int direction, return (action); } } else { - if (sk != NULL) - uma_zfree(V_pf_state_key_z, sk); - if (nk != NULL) - uma_zfree(V_pf_state_key_z, nk); + uma_zfree(V_pf_state_key_z, sk); + uma_zfree(V_pf_state_key_z, nk); } /* copy back packet headers if we performed NAT operations */ @@ -4570,10 +4568,8 @@ cleanup: free(ri, M_PF_RULE_ITEM); } - if (sk != NULL) - uma_zfree(V_pf_state_key_z, sk); - if (nk != NULL) - uma_zfree(V_pf_state_key_z, nk); + uma_zfree(V_pf_state_key_z, sk); + uma_zfree(V_pf_state_key_z, nk); return (PF_DROP); } @@ -4812,10 +4808,8 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, return (PF_PASS); csfailed: - if (sk != NULL) - uma_zfree(V_pf_state_key_z, sk); - if (nk != NULL) - uma_zfree(V_pf_state_key_z, nk); + uma_zfree(V_pf_state_key_z, sk); + uma_zfree(V_pf_state_key_z, nk); if (sn != NULL) { PF_SRC_NODE_LOCK(sn); diff --git a/sys/netpfil/pf/pf_norm.c b/sys/netpfil/pf/pf_norm.c index c0dd3ba60113..8b267636751a 100644 --- a/sys/netpfil/pf/pf_norm.c +++ b/sys/netpfil/pf/pf_norm.c @@ -1576,10 +1576,8 @@ pf_normalize_tcp_init(struct mbuf *m, int off, struct pf_pdesc *pd, void pf_normalize_tcp_cleanup(struct pf_kstate *state) { - if (state->src.scrub) - uma_zfree(V_pf_state_scrub_z, state->src.scrub); - if (state->dst.scrub) - uma_zfree(V_pf_state_scrub_z, state->dst.scrub); + uma_zfree(V_pf_state_scrub_z, state->src.scrub); + uma_zfree(V_pf_state_scrub_z, state->dst.scrub); /* Someday... flush the TCP segment reassembly descriptors. */ }