git: 073b9f50739a - stable/12 - pf: Handle errors returned by pf_killstates()

Kristof Provost kp at FreeBSD.org
Fri Jul 16 11:54:00 UTC 2021


The branch stable/12 has been updated by kp:

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

commit 073b9f50739a725d96c1e9a78a747adbad947e97
Author:     Kristof Provost <kp at FreeBSD.org>
AuthorDate: 2021-07-05 12:21:03 +0000
Commit:     Kristof Provost <kp at FreeBSD.org>
CommitDate: 2021-07-16 08:04:13 +0000

    pf: Handle errors returned by pf_killstates()
    
    Happily this wasn't a real bug, because pf_killstates() never fails, but
    we should check the return value anyway, in case it does ever start
    returning errors.
    
    Reported by:    clang --analyze
    MFC after:      1 week
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
    
    (cherry picked from commit fa96701c8abbc29aad7f8f8d6b823bd7f89c6c15)
---
 sys/netpfil/pf/pf_ioctl.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c
index eb9719886bbe..242d79053d9c 100644
--- a/sys/netpfil/pf/pf_ioctl.c
+++ b/sys/netpfil/pf/pf_ioctl.c
@@ -4955,6 +4955,8 @@ pf_killstates_nv(struct pfioc_nv *nv)
 		ERROUT(error);
 
 	error = pf_killstates(&kill, &killed);
+	if (error)
+		ERROUT(error);
 
 	free(nvlpacked, M_NVLIST);
 	nvlpacked = NULL;


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