Module Name: src
Committed By: christos
Date: Wed Feb 12 01:34:55 UTC 2020
Modified Files:
src/sys/net/npf: npf_ruleset.c
Log Message:
PR/54950: Lloyd Parkes: Avoid NULL deref.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/net/npf/npf_ruleset.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_ruleset.c
diff -u src/sys/net/npf/npf_ruleset.c:1.49 src/sys/net/npf/npf_ruleset.c:1.50
--- src/sys/net/npf/npf_ruleset.c:1.49 Sun Sep 29 13:00:29 2019
+++ src/sys/net/npf/npf_ruleset.c Tue Feb 11 20:34:55 2020
@@ -33,7 +33,7 @@
#ifdef _KERNEL
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_ruleset.c,v 1.49 2019/09/29 17:00:29 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_ruleset.c,v 1.50 2020/02/12 01:34:55 christos Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -153,6 +153,9 @@ npf_ruleset_create(size_t slots)
void
npf_ruleset_destroy(npf_ruleset_t *rlset)
{
+ if (rlset == NULL)
+ return;
+
size_t len = offsetof(npf_ruleset_t, rs_rules[rlset->rs_slots]);
npf_rule_t *rl;
