diff options
| author |   mikeb <mikeb@openbsd.org> | 2008-11-24 13:22:09 +0000 |
|---|---|---|
| committer | mikeb <mikeb@openbsd.org> | 2008-11-24 13:22:09 +0000 |
| commit | 4b3977248902c22d96aaebdb5784840debc2631c (patch) | |
| tree | abe79dda33a98c51b9e716f1edd61d79785c2c44 /sys/net/pf_ioctl.c | |
| parent | switch from using MCLGET to MCLGETI for clusters going onto the rx ring. (diff) | |
| download | wireguard-openbsd-4b3977248902c22d96aaebdb5784840debc2631c.tar.xz wireguard-openbsd-4b3977248902c22d96aaebdb5784840debc2631c.zip | |
Fix splasserts seen in pr 5987 by propagating a flag that discribes
whether we're called from the interrupt context to the functions
performing allocations.
Looked at by mpf@ and henning@, tested by mpf@ and Antti Harri,
the pr originator.
ok tedu
Diffstat (limited to 'sys/net/pf_ioctl.c')
| -rw-r--r-- | sys/net/pf_ioctl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/net/pf_ioctl.c b/sys/net/pf_ioctl.c index 5f0c35be052..408b60f76f6 100644 --- a/sys/net/pf_ioctl.c +++ b/sys/net/pf_ioctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_ioctl.c,v 1.210 2008/10/23 22:22:44 deraadt Exp $ */ +/* $OpenBSD: pf_ioctl.c,v 1.211 2008/11/24 13:22:09 mikeb Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -1164,7 +1164,7 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p) if (rule->overload_tblname[0]) { if ((rule->overload_tbl = pfr_attach_table(ruleset, - rule->overload_tblname)) == NULL) + rule->overload_tblname, 0)) == NULL) error = EINVAL; else rule->overload_tbl->pfrkt_flags |= @@ -1401,7 +1401,7 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p) if (newrule->overload_tblname[0]) { if ((newrule->overload_tbl = pfr_attach_table( - ruleset, newrule->overload_tblname)) == + ruleset, newrule->overload_tblname, 0)) == NULL) error = EINVAL; else |