From nobody Wed Apr 27 12:50:28 2022 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 F3D131AAA5F3; Wed, 27 Apr 2022 12:50:28 +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 4KpJWS4Bq3z4dZM; Wed, 27 Apr 2022 12:50:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651063828; 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=aHPSezJ/BWCdB0rrE9N4/7gmL2LNAbph5CjTE3pSVWE=; b=yYl+AGP7xU0A7RoAPV9aALrdtWxadqGJncsy3TLKl4Cdosz6fFYTLWCm3z4Z3gXQwhNA8j W5dpkRmhF4nGp7s0PHOdWnNP4nOXWZ2/aTSinedLbU0AukEj/iB4TCxrt6y9IaUvAq6zX+ aI5LlTtV+HVmPflns8Ru+9QVHw5RoZKCGNblR7SiMhjzmMmjnmDU/XNFdo+clCflklpHLz cqAxM6iIX6hOhwXul13fHD/C7fvomDOF0JJgR3zYElsg5Z0JhEY+Z3XqtSSTB8eaO5oGrJ /BqXpHgNzMMKchtpspvm+T6h5SeV7QVRy2aIzKYVsewbt1FRuInUpqzlSH40Jg== 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 5ADBF24042; Wed, 27 Apr 2022 12:50:28 +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 23RCoSPh011672; Wed, 27 Apr 2022 12:50:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23RCoSFE011671; Wed, 27 Apr 2022 12:50:28 GMT (envelope-from git) Date: Wed, 27 Apr 2022 12:50:28 GMT Message-Id: <202204271250.23RCoSFE011671@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: 397ccb080dca - stable/13 - pf: remove pointless NULL check 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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: 397ccb080dca4bd475c82ed888107a33eb8f4c3f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651063828; 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=aHPSezJ/BWCdB0rrE9N4/7gmL2LNAbph5CjTE3pSVWE=; b=i1Ja8uNOGnYRtqHWMuD5iAOZOcV6G957VDUEyAveSCWiW97wukDWDQVD/YiEYOewS/ks+3 eUHBSBGKmqOgCDYM5jQocKHxuiXxPiXUGC7K4dAdg9XI6aMN0ljf6wQ1H02RJt6FpuGy14 efrER5VaT7F70w8YD7Q11zDKZJeJHhRyavZgXBY5KVWrah7on3dX4aCB30ItLp5tS12vqx pdF6cjlPj0NCl4Jna81qyeOGpEgmG0FyoWOvliuvfHQEXTb0WHbsHYr2FHhWkVwuvvWUhG jmKrixUWAoe26pdFavsRiEsj8+VHafaiDHZ4xNneYGw/Oz5oxUDCUp/8zaByqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651063828; a=rsa-sha256; cv=none; b=cgj9GpmUEiD3X1a0Pz+AcwhbuQpvAhVS18/nU8UTNpZRpUXAP48D4cBPiL1U9Naiy8XwZ0 P2KJGfEnxBg5QRJA8svpcALxdLgRI+XwPLdluuWBUDutaR8/sfOtMYasPU6gPXegQO5Cfy rT9GPdQLv0L5FYIgzjvbryqPXBmlTC5QGDc9HFBp4gDvE35p4Xyqp5HrClPmtECfJFP/sY 4WZK2U4+lI3x7G/H3HUhsrh09AgbxF/UFqaqBBvn8NcIWvLEMmQuXwETURCyIeuXXB1b23 6ax6TIdPtmiDH9zXAGL1PtvpAiUSI9GihMzlBcegtps+C/G33j2OdIRDDN9C8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=397ccb080dca4bd475c82ed888107a33eb8f4c3f commit 397ccb080dca4bd475c82ed888107a33eb8f4c3f Author: Kristof Provost AuthorDate: 2022-04-21 12:33:48 +0000 Commit: Kristof Provost CommitDate: 2022-04-27 06:46:48 +0000 pf: remove pointless NULL check pfi_kkif_attach() always returns non-NULL, and we dereference the pointer before we check it, so that's pointless. Reported by: Coverity (CID 1007345) MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit ed6287c14168de409c5f333bda59896c8109eb70) --- sys/netpfil/pf/pf_if.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf_if.c b/sys/netpfil/pf/pf_if.c index dcbbce08ed6c..cdde753c41b3 100644 --- a/sys/netpfil/pf/pf_if.c +++ b/sys/netpfil/pf/pf_if.c @@ -563,8 +563,7 @@ _bad: pfr_detach_table(dyn->pfid_kt); if (ruleset != NULL) pf_remove_if_empty_kruleset(ruleset); - if (dyn->pfid_kif != NULL) - pfi_kkif_unref(dyn->pfid_kif); + pfi_kkif_unref(dyn->pfid_kif); free(dyn, PFI_MTYPE); return (rv);