Skip to contentSkip to conversation

: Unregister inetdev notifiers on failure

PATCH New Chris Lalancette 1 participant 1 message Feb 27, 2009 Xen hypervisor interface

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 : Unregister inetdev notifiers on failure

(Kier, I'm not sure if you are still accepting patches for the linux-2.6.18-xen.hg tree, but if so...)

If you attempt to modprobe the pv-on-hvm netfront driver on a machine not running under Xen (say, bare-metal, or under another hypervisor), the netfront code correctly returns an ENODEV and fails to load. However, if you then shutdown that machine, you will oops while tearing down the network. This is because we forget to unregister the the inetaddr_notifier on failure, and so the kernel takes a fatal page fault. The attached patch just unregisters the notifier on failure, and solves the problem for me.

drivers/xen/netfront/netfront.c +9 -1
@@ -2199,6 +2199,8 @@ static struct xenbus_driver netfront_dri
 
 static int __init netif_init(void)
 {
+	int err;
+
 	if (!is_running_on_xen())
 		return -ENODEV;
 
@@ -2220,7 +2222,13 @@ static int __init netif_init(void)
 	(void)register_inetaddr_notifier(&notifier_inetdev);
 #endif
 
-	return xenbus_register_frontend(&netfront_driver);
+	err = xenbus_register_frontend(&netfront_driver);
+	if (err) {
+#ifdef CONFIG_INET
+		unregister_inetaddr_notifier(&notifier_inetdev);
+#endif
+	}
+	return err;
 }
 module_init(netif_init);
 

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel