d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pf: Remove unneeded NULL check

Browse Source 
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")
This commit is contained in:
Kristof Provost 2021-07-05 14:02:06 +02:00
parent 211cddf9e3
commit 8cceacc0f1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/netpfil/pf/pf_table.c
View File

@ -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)