git: 28ed948ec1d7 - stable/12 - pf: Remove redundant kif != NULL checks

Kristof Provost kp at FreeBSD.org
Sat Mar 20 09:59:45 UTC 2021


The branch stable/12 has been updated by kp:

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

commit 28ed948ec1d74009bc90a661007b017c7e8471c7
Author:     Kristof Provost <kp at FreeBSD.org>
AuthorDate: 2021-03-10 14:50:42 +0000
Commit:     Kristof Provost <kp at FreeBSD.org>
CommitDate: 2021-03-19 22:39:42 +0000

    pf: Remove redundant kif != NULL checks
    
    pf_kkif_free() already checks for NULL, so we don't have to check before
    we call it.
    
    Reviewed by:    melifaro@
    MFC after:      1 week
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
    Differential Revision:  https://reviews.freebsd.org/D29195
    
    (cherry picked from commit 913e7dc3e0eb7df78ec0e7ecc7dd160a316a3ac6)
---
 sys/netpfil/pf/pf_ioctl.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c
index 02ad40c6abd9..c50904e28dc6 100644
--- a/sys/netpfil/pf/pf_ioctl.c
+++ b/sys/netpfil/pf/pf_ioctl.c
@@ -2013,8 +2013,7 @@ pfioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flags, struct thread *td
 DIOCADDRULE_error:
 		PF_RULES_WUNLOCK();
 		pf_krule_free(rule);
-		if (kif)
-			pf_kkif_free(kif);
+		pf_kkif_free(kif);
 		break;
 	}
 
@@ -2313,8 +2312,7 @@ DIOCADDRULE_error:
 DIOCCHANGERULE_error:
 		PF_RULES_WUNLOCK();
 		pf_krule_free(newrule);
-		if (kif != NULL)
-			pf_kkif_free(kif);
+		pf_kkif_free(kif);
 		break;
 	}
 
@@ -3159,8 +3157,7 @@ DIOCCHANGEADDR_error:
 			free(newpa, M_PFRULE);
 		}
 		PF_RULES_WUNLOCK();
-		if (kif != NULL)
-			pf_kkif_free(kif);
+		pf_kkif_free(kif);
 		break;
 	}
 


More information about the dev-commits-src-all mailing list