d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rule memory garbage collecting in new pf scans only states that are on

Browse Source 
id hash. If a state has been disconnected from id hash, its rule pointers
can no longer be dereferenced, and referenced memory can't be modified.
Thus, move rule statistics from pf_free_rule() to pf_unlink_rule() and
update them prior to releasing id hash slot lock.

Reported by:	Ian FREISLICH <ianf cloudseed.co.za>
This commit is contained in:
glebius 2012-12-06 08:38:14 +00:00
parent d88e4529b6
commit 0777f694d3
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/netpfil/pf/pf.c
View File

@ -1504,6 +1504,12 @@ pf_unlink_state(struct pf_state *s, u_int flags)
if (pfsync_delete_state_ptr != NULL)
pfsync_delete_state_ptr(s);
--s->rule.ptr->states_cur;
if (s->nat_rule.ptr != NULL)
--s->nat_rule.ptr->states_cur;
if (s->anchor.ptr != NULL)
--s->anchor.ptr->states_cur;
s->timeout = PFTM_UNLINKED;
PF_HASHROW_UNLOCK(ih);
@ -1521,11 +1527,7 @@ pf_free_state(struct pf_state *cur)
KASSERT(cur->refs == 0, ("%s: %p has refs", __func__, cur));
KASSERT(cur->timeout == PFTM_UNLINKED, ("%s: timeout %u", __func__,
cur->timeout));
--cur->rule.ptr->states_cur;
if (cur->nat_rule.ptr != NULL)
--cur->nat_rule.ptr->states_cur;
if (cur->anchor.ptr != NULL)
--cur->anchor.ptr->states_cur;
pf_normalize_tcp_cleanup(cur);
uma_zfree(V_pf_state_z, cur);
V_pf_status.fcounters[FCNT_STATE_REMOVALS]++;