Module Name: src
Committed By: pgoyette
Date: Mon Mar 25 09:32:25 UTC 2019
Modified Files:
src/sys/net: if_tap.c
Log Message:
Resequence the activities in tapdetach() so that no new units can be
created, either by opening /dev/tap or ifconfig tapx create, before
checking to see if we have any active units.
To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 src/sys/net/if_tap.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/net/if_tap.c
diff -u src/sys/net/if_tap.c:1.107 src/sys/net/if_tap.c:1.108
--- src/sys/net/if_tap.c:1.107 Mon Sep 3 16:29:35 2018
+++ src/sys/net/if_tap.c Mon Mar 25 09:32:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tap.c,v 1.107 2018/09/03 16:29:35 riastradh Exp $ */
+/* $NetBSD: if_tap.c,v 1.108 2019/03/25 09:32:25 pgoyette Exp $ */
/*
* Copyright (c) 2003, 2004, 2008, 2009 The NetBSD Foundation.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.107 2018/09/03 16:29:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.108 2019/03/25 09:32:25 pgoyette Exp $");
#if defined(_KERNEL_OPT)
@@ -273,20 +273,32 @@ tapdetach(void)
{
int error = 0;
- if (tap_count != 0)
- return EBUSY;
-
+ if_clone_detach(&tap_cloners);
#ifdef _MODULE
- if (error == 0)
- error = devsw_detach(NULL, &tap_cdevsw);
+ error = devsw_detach(NULL, &tap_cdevsw);
+ if (error != 0)
+ goto out2;
#endif
- if (error == 0)
- sysctl_teardown(&tap_sysctl_clog);
- if (error == 0)
- if_clone_detach(&tap_cloners);
- if (error == 0)
- error = config_cfattach_detach(tap_cd.cd_name, &tap_ca);
+ if (tap_count != 0) {
+ error = EBUSY;
+ goto out1;
+ }
+
+ error = config_cfattach_detach(tap_cd.cd_name, &tap_ca);
+ if (error != 0)
+ goto out1;
+
+ sysctl_teardown(&tap_sysctl_clog);
+
+ return 0;
+
+ out1:
+#ifdef _MODULE
+ devsw_attach("tap", NULL, &tap_bmajor, &tap_cdevsw, &tap_cmajor);
+#endif
+ out2:
+ if_clone_attach(&tap_cloners);
return error;
}
