diff options
| author | Daniel Hartmeier <dhartmei@cvs.openbsd.org> | 2002-12-19 16:25:52 +0000 |
|---|---|---|
| committer | Daniel Hartmeier <dhartmei@cvs.openbsd.org> | 2002-12-19 16:25:52 +0000 |
| commit | 86103d0701c7eeb6e743f4cd8ba63f6baa29ba7c (patch) | |
| tree | 8a6a2be3d91969430bf8bdef33e495ee5c9d3048 /sys/net | |
| parent | 652f1f5c522718aeff1a812318ab48ce3619a430 (diff) | |
Clear pf_state.nat_rule pointers when non-main nat rules are removed.
Unlike with filter rules, nat rules inside anchors might be pointed to.
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/pf_ioctl.c | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/sys/net/pf_ioctl.c b/sys/net/pf_ioctl.c index 420136a43ed..3bb27e06710 100644 --- a/sys/net/pf_ioctl.c +++ b/sys/net/pf_ioctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_ioctl.c,v 1.29 2002/12/18 19:40:41 dhartmei Exp $ */ +/* $OpenBSD: pf_ioctl.c,v 1.30 2002/12/19 16:25:51 dhartmei Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -608,14 +608,13 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p) /* * Rules are about to get freed, clear rule pointers in states */ - if (ruleset == &pf_main_ruleset) { - if (rs_num == PF_RULESET_RULE) + if (rs_num == PF_RULESET_RULE) { + if (ruleset == &pf_main_ruleset) RB_FOREACH(n, pf_state_tree, &tree_ext_gwy) n->state->rule.ptr = NULL; - else - RB_FOREACH(n, pf_state_tree, &tree_ext_gwy) - n->state->nat_rule = NULL; - } + } else + RB_FOREACH(n, pf_state_tree, &tree_ext_gwy) + n->state->nat_rule = NULL; old_rules = ruleset->rules[rs_num].active.ptr; ruleset->rules[rs_num].active.ptr = ruleset->rules[rs_num].inactive.ptr; @@ -800,13 +799,11 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p) if (pcr->action == PF_CHANGE_REMOVE) { struct pf_tree_node *n; - if (ruleset == &pf_main_ruleset) { - RB_FOREACH(n, pf_state_tree, &tree_ext_gwy) { - if (n->state->rule.ptr == oldrule) - n->state->rule.ptr = NULL; - if (n->state->nat_rule == oldrule) - n->state->nat_rule = NULL; - } + RB_FOREACH(n, pf_state_tree, &tree_ext_gwy) { + if (n->state->rule.ptr == oldrule) + n->state->rule.ptr = NULL; + if (n->state->nat_rule == oldrule) + n->state->nat_rule = NULL; } pf_rm_rule(ruleset->rules[rs_num].active.ptr, oldrule); } else { |