Module Name: src
Committed By: ozaki-r
Date: Tue Nov 21 07:33:06 UTC 2017
Modified Files:
src/sys/netipsec: key.c
Log Message:
Call key_sendup_mbuf immediately unless key_acquire is called in softint
We need to defer it only if it's called in softint to avoid deadlock.
To generate a diff of this commit:
cvs rdiff -u -r1.241 -r1.242 src/sys/netipsec/key.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netipsec/key.c
diff -u src/sys/netipsec/key.c:1.241 src/sys/netipsec/key.c:1.242
--- src/sys/netipsec/key.c:1.241 Tue Nov 21 07:25:17 2017
+++ src/sys/netipsec/key.c Tue Nov 21 07:33:06 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: key.c,v 1.241 2017/11/21 07:25:17 ozaki-r Exp $ */
+/* $NetBSD: key.c,v 1.242 2017/11/21 07:33:06 ozaki-r Exp $ */
/* $FreeBSD: src/sys/netipsec/key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $ */
/* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.241 2017/11/21 07:25:17 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.242 2017/11/21 07:33:06 ozaki-r Exp $");
/*
* This code is referred to RFC 2367
@@ -6570,6 +6570,12 @@ key_acquire(const struct secasindex *sai
PFKEY_UNIT64(result->m_pkthdr.len);
/*
+ * Called from key_api_acquire that must come from userland, so
+ * we can call key_sendup_mbuf immediately.
+ */
+ if (mflag == M_WAITOK)
+ return key_sendup_mbuf(NULL, result, KEY_SENDUP_REGISTERED);
+ /*
* XXX we cannot call key_sendup_mbuf directly here because
* it can cause a deadlock:
* - We have a reference to an SP (and an SA) here
