Module Name: src
Committed By: christos
Date: Mon Jan 25 17:17:19 UTC 2021
Modified Files:
src/sys/net/npf: npf_os.c
Log Message:
Fix locking issue: npf_default_pass needs to be called with the config lock
held.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/net/npf/npf_os.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/npf/npf_os.c
diff -u src/sys/net/npf/npf_os.c:1.19 src/sys/net/npf/npf_os.c:1.20
--- src/sys/net/npf/npf_os.c:1.19 Tue Aug 18 03:53:24 2020
+++ src/sys/net/npf/npf_os.c Mon Jan 25 12:17:19 2021
@@ -33,7 +33,7 @@
#ifdef _KERNEL
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_os.c,v 1.19 2020/08/18 07:53:24 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_os.c,v 1.20 2021/01/25 17:17:19 christos Exp $");
#ifdef _KERNEL_OPT
#include "pf.h"
@@ -321,8 +321,16 @@ npf_dev_read(dev_t dev, struct uio *uio,
bool
npf_autounload_p(void)
{
+ if (npf_active_p())
+ return false;
+
npf_t *npf = npf_getkernctx();
- return !npf_active_p() && npf_default_pass(npf);
+
+ npf_config_enter(npf);
+ bool pass = npf_default_pass(npf);
+ npf_config_exit(npf);
+
+ return pass;
}
/*
