Module Name: src Committed By: martin Date: Wed Feb 12 19:41:13 UTC 2020
Modified Files: src/sys/net/npf [netbsd-9]: npf_ruleset.c Log Message: Pull up following revision(s) (requested by christos in ticket #699): sys/net/npf/npf_ruleset.c: revision 1.50 PR/54950: Lloyd Parkes: Avoid NULL deref. To generate a diff of this commit: cvs rdiff -u -r1.48.2.1 -r1.48.2.2 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.48.2.1 src/sys/net/npf/npf_ruleset.c:1.48.2.2 --- src/sys/net/npf/npf_ruleset.c:1.48.2.1 Fri Oct 4 08:06:35 2019 +++ src/sys/net/npf/npf_ruleset.c Wed Feb 12 19:41:12 2020 @@ -33,7 +33,7 @@ #ifdef _KERNEL #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: npf_ruleset.c,v 1.48.2.1 2019/10/04 08:06:35 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: npf_ruleset.c,v 1.48.2.2 2020/02/12 19:41:12 martin 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;