git: a47d7a2e8e19 - stable/13 - pf: Remove unneeded NULL check

[Kristof Provost]

The branch stable/13 has been updated by kp:

URL: https://cgit.FreeBSD.org/src/commit/?id=a47d7a2e8e19b87c9871bcb54942150bb4e1ff98

commit a47d7a2e8e19b87c9871bcb54942150bb4e1ff98
Author:     Kristof Provost <kp at FreeBSD.org>
AuthorDate: 2021-07-05 12:02:06 +0000
Commit:     Kristof Provost <kp at FreeBSD.org>
CommitDate: 2021-07-16 09:08:27 +0000

    pf: Remove unneeded NULL check
    
    pidx is never NULL, and is used unconditionally later on in the
    function.
    Add an assertion, as documentation for the requirement to provide an idx
    pointer.
    
    Reported by:    clang --analyze
    MFC after:      1 week
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
    
    (cherry picked from commit 8cceacc0f1ee6a77c5f0566b8e6b0f054160fb20)
---
 sys/netpfil/pf/pf_table.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sys/netpfil/pf/pf_table.c b/sys/netpfil/pf/pf_table.c
index 5afc90e54d7c..4cfe5d61e83e 100644
--- a/sys/netpfil/pf/pf_table.c
+++ b/sys/netpfil/pf/pf_table.c
@@ -2177,6 +2177,8 @@ pfr_pool_get(struct pfr_ktable *kt, int *pidx, struct pf_addr *counter,
 	struct pfr_kentry	*ke, *ke2 = NULL;
 	int			 idx = -1, use_counter = 0;
 
+	MPASS(pidx != NULL);
+
 	switch (af) {
 	case AF_INET:
 		uaddr.sin.sin_len = sizeof(struct sockaddr_in);
@@ -2194,8 +2196,7 @@ pfr_pool_get(struct pfr_ktable *kt, int *pidx, struct pf_addr *counter,
 	if (!(kt->pfrkt_flags & PFR_TFLAG_ACTIVE))
 		return (-1);
 
-	if (pidx != NULL)
-		idx = *pidx;
+	idx = *pidx;
 	if (counter != NULL && idx >= 0)
 		use_counter = 1;
 	if (idx < 0)