summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2008-11-29 19:57:09 +0000
committerderaadt <deraadt@openbsd.org>2008-11-29 19:57:09 +0000
commit97e1e11a53c14c74be59f25629cf3c5592a711c0 (patch)
tree979293bbeaecaba2feffbb2a3a3c6f9f7e848ae7
parentuse the the correct register mask. Fixes certain mixer settings (diff)
downloadwireguard-openbsd-97e1e11a53c14c74be59f25629cf3c5592a711c0.tar.xz
wireguard-openbsd-97e1e11a53c14c74be59f25629cf3c5592a711c0.zip
need splvm() around the call to m_extfree() in the defragger
-rw-r--r--sys/kern/uipc_mbuf.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index 0790ae1963f..da1e3013b8e 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uipc_mbuf.c,v 1.106 2008/11/26 23:47:14 claudio Exp $ */
+/* $OpenBSD: uipc_mbuf.c,v 1.107 2008/11/29 19:57:09 deraadt Exp $ */
/* $NetBSD: uipc_mbuf.c,v 1.15.4.1 1996/06/13 17:11:44 cgd Exp $ */
/*
@@ -398,8 +398,11 @@ m_defrag(struct mbuf *m, int how)
m_freem(m->m_next);
m->m_next = NULL;
- if (m->m_flags & M_EXT)
+ if (m->m_flags & M_EXT) {
+ int s = splvm();
m_extfree(m);
+ splx(s);
+ }
/*
* Bounce copy mbuf over to the original mbuf and set everything up.