[Xen-changelog] [linux-2.6.18-xen] netfront: Unregister inetdev notifiers on failure

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1235992012 0
# Node ID 86e119bc82c5137e502bc8f68f65aba37f0a1a02
# Parent  979f8ccc314cd873e853fa9be6a72324c8ad119c
netfront: Unregister inetdev notifiers on failure
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.

Signed-off-by: Chris Lalancette <clalance@xxxxxxxxxx>
---
 drivers/xen/netfront/netfront.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletion(-)

diff -r 979f8ccc314c -r 86e119bc82c5 drivers/xen/netfront/netfront.c
--- a/drivers/xen/netfront/netfront.c   Mon Mar 02 11:02:00 2009 +0000
+++ b/drivers/xen/netfront/netfront.c   Mon Mar 02 11:06:52 2009 +0000
@@ -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-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog