summaryrefslogtreecommitdiffstats
path: root/sys/netinet6/in6_rmx.c
diff options
context:
space:
mode:
authordteske <dteske@FreeBSD.org>2016-02-11 17:07:19 +0000
committerdteske <dteske@FreeBSD.org>2016-02-11 17:07:19 +0000
commit51b30e8967e6d3ca63e740b2ffa317c7179fbdee (patch)
treecce460a0a632676f5ec27d9f4d6eb3ef6b20c66c /sys/netinet6/in6_rmx.c
parent0d45ed6f45ba3b645811c9a96a7d5e4d53d91bcd (diff)
downloadFreeBSD-src-51b30e8967e6d3ca63e740b2ffa317c7179fbdee.zip
FreeBSD-src-51b30e8967e6d3ca63e740b2ffa317c7179fbdee.tar.gz
Merge SVN r295220 (bz) from projects/vnet/
Fix a panic that occurs when a vnet interface is unavailable at the time the vnet jail referencing said interface is stopped. Sponsored by: FIS Global, Inc.
Diffstat (limited to 'sys/netinet6/in6_rmx.c')
-rw-r--r--sys/netinet6/in6_rmx.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/netinet6/in6_rmx.c b/sys/netinet6/in6_rmx.c
index 38b4bf2..102ad50 100644
--- a/sys/netinet6/in6_rmx.c
+++ b/sys/netinet6/in6_rmx.c
@@ -237,7 +237,9 @@ in6_detachhead(void **head, int off)
{
callout_drain(&V_rtq_mtutimer);
- return (rn_detachhead(head));
+ rt_table_destroy((struct rib_head *)(*head));
+
+ return (1);
}
#endif
OpenPOWER on IntegriCloud