diff options
| author |   bluhm <bluhm@openbsd.org> | 2017-11-14 14:46:49 +0000 |
|---|---|---|
| committer | bluhm <bluhm@openbsd.org> | 2017-11-14 14:46:49 +0000 |
| commit | e5070f931d977affcea2693b17844f86d4d248c0 (patch) | |
| tree | 62e201d2d1e29a2afc51fb2bad5f170f81c627df | |
| parent | Fix the initial check of the checkorder and lock operations (diff) | |
| download | wireguard-openbsd-e5070f931d977affcea2693b17844f86d4d248c0.tar.xz wireguard-openbsd-e5070f931d977affcea2693b17844f86d4d248c0.zip | |
Put the net lock around frag6_freef() as it sends ICMP6 error
messages. Splassert was triggered by regress/sys/netinet6/frag6.
OK mpi@ sashan@ visa@
| -rw-r--r-- | sys/netinet6/frag6.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c index c273fa05ca9..7b874e37bab 100644 --- a/sys/netinet6/frag6.c +++ b/sys/netinet6/frag6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: frag6.c,v 1.80 2017/11/13 07:16:35 mpi Exp $ */ +/* $OpenBSD: frag6.c,v 1.81 2017/11/14 14:46:49 bluhm Exp $ */ /* $KAME: frag6.c,v 1.40 2002/05/27 21:40:31 itojun Exp $ */ /* @@ -593,8 +593,12 @@ frag6_slowtimo(void) mtx_leave(&frag6_mutex); - while ((q6 = TAILQ_FIRST(&rmq6)) != NULL) { - TAILQ_REMOVE(&rmq6, q6, ip6q_queue); - frag6_freef(q6); + if (!TAILQ_EMPTY(&rmq6)) { + NET_LOCK(); + while ((q6 = TAILQ_FIRST(&rmq6)) != NULL) { + TAILQ_REMOVE(&rmq6, q6, ip6q_queue); + frag6_freef(q6); + } + NET_UNLOCK(); } } |