Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix panic when using ecryption devices attached earlier than ipi_sysinit().

Browse Source 
pointed out and tested by martin@n.o, thanks.
This commit is contained in:
knakahara 2017-07-20 09:31:36 +00:00
parent 8487e35ae9
commit f2a05a61c3
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sys/opencrypto/crypto.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: crypto.c,v 1.92 2017/07/18 06:01:36 knakahara Exp $ */ /* $NetBSD: crypto.c,v 1.93 2017/07/20 09:31:36 knakahara Exp $ */
/* $FreeBSD: src/sys/opencrypto/crypto.c,v 1.4.2.5 2003/02/26 00:14:05 sam Exp $ */ /* $FreeBSD: src/sys/opencrypto/crypto.c,v 1.4.2.5 2003/02/26 00:14:05 sam Exp $ */
/* $OpenBSD: crypto.c,v 1.41 2002/07/17 23:52:38 art Exp $ */ /* $OpenBSD: crypto.c,v 1.41 2002/07/17 23:52:38 art Exp $ */
@ -53,7 +53,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: crypto.c,v 1.92 2017/07/18 06:01:36 knakahara Exp $"); __KERNEL_RCSID(0, "$NetBSD: crypto.c,v 1.93 2017/07/20 09:31:36 knakahara Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/reboot.h> #include <sys/reboot.h>
@ -68,6 +68,7 @@ __KERNEL_RCSID(0, "$NetBSD: crypto.c,v 1.92 2017/07/18 06:01:36 knakahara Exp $"
#include <sys/errno.h> #include <sys/errno.h>
#include <sys/module.h> #include <sys/module.h>
#include <sys/xcall.h> #include <sys/xcall.h>
#include <sys/device.h>
#if defined(_KERNEL_OPT) #if defined(_KERNEL_OPT)
#include "opt_ocf.h" #include "opt_ocf.h"
@ -382,6 +383,8 @@ static void crypto_driver_lock(struct cryptocap *);
static void crypto_driver_unlock(struct cryptocap *); static void crypto_driver_unlock(struct cryptocap *);
static void crypto_driver_clear(struct cryptocap *); static void crypto_driver_clear(struct cryptocap *);
static int crypto_init_finalize(device_t);
static struct cryptostats cryptostats; static struct cryptostats cryptostats;
#ifdef CRYPTO_TIMING #ifdef CRYPTO_TIMING
static int crypto_timing = 0; static int crypto_timing = 0;
@ -417,10 +420,13 @@ crypto_init0(void)
return crypto_destroy(false); return crypto_destroy(false);
} }
crypto_ret_si = softint_establish(SOFTINT_NET|SOFTINT_MPSAFE|SOFTINT_RCPU, /*
&cryptoret_softint, NULL); * Some encryption devices(such as mvcesa) is attached before
if (crypto_ret_si == NULL) { * ipi_sysinit(). That causes assertion in ipi_register() as
printf("crypto_init: cannot establish ret queue handler\n"); * crypto_ret_si softint uses SOFTINT_RCPU.
*/
if (config_finalize_register(NULL, crypto_init_finalize) != 0) {
printf("crypto_init: cannot register crypto_init_finalize\n");
return crypto_destroy(false); return crypto_destroy(false);
} }
@ -429,6 +435,17 @@ crypto_init0(void)
return 0; return 0;
} }
static int
crypto_init_finalize(device_t self __unused)
{
crypto_ret_si = softint_establish(SOFTINT_NET|SOFTINT_MPSAFE|SOFTINT_RCPU,
&cryptoret_softint, NULL);
KASSERT(crypto_ret_si != NULL);
return 0;
}
int int
crypto_init(void) crypto_init(void)
{ {