[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <d45a3acc0911241715k6882aa3el64a50b3d68d12167@mail.gmail.com>
Date: Wed, 25 Nov 2009 12:15:42 +1100
From: andrew hendry <andrew.hendry@...il.com>
To: netdev@...r.kernel.org
Cc: linux-kernel <linux-kernel@...r.kernel.org>,
linux-x25@...r.kernel.org
Subject: [PATCH 2/3] X25: Check for errors in x25_init
Adds error checking to x25_init.
Signed-off-by: Andrew Hendry <andrew.hendry@...il.com>
diff -uprN -X a/Documentation/dontdiff a/net/x25/af_x25.c b/net/x25/af_x25.c
--- a/net/x25/af_x25.c 2009-11-25 10:21:17.000000000 +1100
+++ b/net/x25/af_x25.c 2009-11-25 10:22:06.000000000 +1100
@@ -1659,18 +1659,31 @@ static int __init x25_init(void)
if (rc != 0)
goto out;
- sock_register(&x25_family_ops);
+ rc = sock_register(&x25_family_ops);
+ if (rc != 0)
+ goto out_proto;
dev_add_pack(&x25_packet_type);
- register_netdevice_notifier(&x25_dev_notifier);
+ rc = register_netdevice_notifier(&x25_dev_notifier);
+ if (rc != 0)
+ goto out_sock;
printk(KERN_INFO "X.25 for Linux Version 0.2\n");
x25_register_sysctl();
- x25_proc_init();
+ rc = x25_proc_init();
+ if (rc != 0)
+ goto out_dev;
out:
return rc;
+out_dev:
+ unregister_netdevice_notifier(&x25_dev_notifier);
+out_sock:
+ sock_unregister(AF_X25);
+out_proto:
+ proto_unregister(&x25_proto);
+ goto out;
}
module_init(x25_init);
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists