diff options
| author | rodrigc <rodrigc@FreeBSD.org> | 2013-07-15 01:32:55 +0000 |
|---|---|---|
| committer | rodrigc <rodrigc@FreeBSD.org> | 2013-07-15 01:32:55 +0000 |
| commit | 7e3e1747c886c2c26003f94ad0e7dd03ea6cde2a (patch) | |
| tree | 07b12ddaa4af38870ab0290b71afcba393c21913 /sys/kern/subr_bus.c | |
| parent | 2bfbfc539c4069e052503398bf33ced4b1e83959 (diff) | |
| download | FreeBSD-src-7e3e1747c886c2c26003f94ad0e7dd03ea6cde2a.zip FreeBSD-src-7e3e1747c886c2c26003f94ad0e7dd03ea6cde2a.tar.gz | |
PR: 168520 170096
Submitted by: adrian, zec
Fix multiple kernel panics when VIMAGE is enabled in the kernel.
These fixes are based on patches submitted by Adrian Chadd and Marko Zec.
(1) Set curthread->td_vnet to vnet0 in device_probe_and_attach() just before calling
device_attach(). This fixes multiple VIMAGE related kernel panics
when trying to attach Bluetooth or USB Ethernet devices because
curthread->td_vnet is NULL.
(2) Set curthread->td_vnet in if_detach(). This fixes kernel panics when detaching networking
interfaces, especially USB Ethernet devices.
(3) Use VNET_DOMAIN_SET() in ng_btsocket.c
(4) In ng_unref_node() set curthread->td_vnet. This fixes kernel panics
when detaching Netgraph nodes.
Diffstat (limited to 'sys/kern/subr_bus.c')
| -rw-r--r-- | sys/kern/subr_bus.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index f196c8b..717ded4 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -53,6 +53,8 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <sys/interrupt.h> +#include <net/vnet.h> + #include <machine/stdarg.h> #include <vm/uma.h> @@ -2735,7 +2737,11 @@ device_probe_and_attach(device_t dev) return (0); else if (error != 0) return (error); - return (device_attach(dev)); + + CURVNET_SET_QUIET(vnet0); + error = device_attach(dev); + CURVNET_RESTORE(); + return error; } /** |
