diff options
author | Kristof Provost <kp@FreeBSD.org> | 2021-11-04 17:05:58 +0000 |
---|---|---|
committer | Kristof Provost <kp@FreeBSD.org> | 2021-11-29 14:58:07 +0000 |
commit | b4a51fd9c12493e9e7ca6e2ac572ec41d99a941c (patch) | |
tree | 824fd992beaa08fb784d31f248b34b00527143d2 | |
parent | f4777562833311b5b4c99e5dda8d50d91a514bf0 (diff) | |
download | src-b4a51fd9c12493e9e7ca6e2ac572ec41d99a941c.tar.gz src-b4a51fd9c12493e9e7ca6e2ac572ec41d99a941c.zip |
if_gif: fix vnet shutdown panic
If an if_gif exists and has an address assigned inside a vnet when the
vnet is shut down we failed to clean up the address, leading to a panic
when we ip_destroy() and the V_in_ifaddrhashtbl is not empty.
This happens because of the VNET_SYS(UN)INIT order, which means we
destroy the if_gif interface before the addresses can be purged (and
if_detach() does not remove addresses, it assumes this will be done by
the stack teardown code).
Set subsystem SI_SUB_PSEUDO just like if_bridge so the cleanup
operations happen in the correct order.
MFC after: 3 weeks
Sponsored by: Rubicon Communications, LLC ("Netgate")
Differential Revision: https://reviews.freebsd.org/D32835
(cherry picked from commit 8ca6c11a7cf834721c03cbe1a1aab0a17bae4d4d)
-rw-r--r-- | sys/net/if_gif.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c index c9ccee4c98bd..ae70cb9e7715 100644 --- a/sys/net/if_gif.c +++ b/sys/net/if_gif.c @@ -214,7 +214,7 @@ vnet_gif_init(const void *unused __unused) in6_gif_init(); #endif } -VNET_SYSINIT(vnet_gif_init, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY, +VNET_SYSINIT(vnet_gif_init, SI_SUB_PSEUDO, SI_ORDER_ANY, vnet_gif_init, NULL); static void @@ -229,7 +229,7 @@ vnet_gif_uninit(const void *unused __unused) in6_gif_uninit(); #endif } -VNET_SYSUNINIT(vnet_gif_uninit, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY, +VNET_SYSUNINIT(vnet_gif_uninit, SI_SUB_PSEUDO, SI_ORDER_ANY, vnet_gif_uninit, NULL); static int |