diff options
| author |   henning <henning@openbsd.org> | 2013-08-19 09:16:25 +0000 |
|---|---|---|
| committer | henning <henning@openbsd.org> | 2013-08-19 09:16:25 +0000 |
| commit | c5611d5b704bb6deba60968c35a4e0f91f105a53 (patch) | |
| tree | e01761986c824d893b19d6768eda4bfd57379127 | |
| parent | Fix double allocation of memory in beagle machdep. This was caused by (diff) | |
| download | wireguard-openbsd-c5611d5b704bb6deba60968c35a4e0f91f105a53.tar.xz wireguard-openbsd-c5611d5b704bb6deba60968c35a4e0f91f105a53.zip | |
in pf_test_rule, when dealing with a match rule, obey the match rule's quick
flag to decide wether to abort ruleset eval instead of the last matching rule's
one. makes "match quick" abort ruleset evaluation with the current block/pass
state. from Maxim Khitrov <max at mxcrypt.com>, ok bluhm mikeb
| -rw-r--r-- | sys/net/pf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/net/pf.c b/sys/net/pf.c index 1820b5cd8e8..de3440e4294 100644 --- a/sys/net/pf.c +++ b/sys/net/pf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf.c,v 1.838 2013/07/05 13:07:57 blambert Exp $ */ +/* $OpenBSD: pf.c,v 1.839 2013/08/19 09:16:25 henning Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -3323,7 +3323,7 @@ pf_test_rule(struct pf_pdesc *pd, struct pf_rule **rm, struct pf_state **sm, } } - if ((*rm)->quick) + if (r->quick) break; r = TAILQ_NEXT(r, entries); } else |