Fix crash in nwfilter driver check

The nwfilterDriverActive() could de-reference a NULL pointer
if it hadn't be started at the point it was called. It was
also not thread safe, since it lacked locking around data
accesses.

* src/nwfilter/nwfilter_driver.c: Fix locking & NULL checks
  in nwfilterDriverActive()

diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c
index d37ee605fd976f671793e4f8a60122c71c1a9a1a..3ded2beb144c0f54f826232e4b959c29ae79780d 100644 (file)
--- a/src/nwfilter/nwfilter_driver.c
+++ b/src/nwfilter/nwfilter_driver.c
@@ -164,9 +164,16 @@ nwfilterDriverReload(void) {
  */
 static int
 nwfilterDriverActive(void) {
-    if (!driverState->pools.count)
+    int ret;
+
+    if (!driverState)
         return 0;
-    return 1;
+
+    nwfilterDriverLock(driverState);
+    ret = driverState->pools.count ? 1 : 0;
+    nwfilterDriverUnlock(driverState);
+
+    return ret;
 }
 
 /**