Phonet: handle rtnetlink registration failure

Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 9 insertions, 4 deletions

diff --git a/net/phonet/pn_netlink.c b/net/phonet/pn_netlink.c
index 242fe8f8c322..918a4f07f24a 100644
--- a/net/phonet/pn_netlink.c
+++ b/net/phonet/pn_netlink.c
@@ -160,9 +160,14 @@ out:
         return skb->len;
 }
 
-void __init phonet_netlink_register(void)
+int __init phonet_netlink_register(void)
 {
-        rtnl_register(PF_PHONET, RTM_NEWADDR, addr_doit, NULL);
-        rtnl_register(PF_PHONET, RTM_DELADDR, addr_doit, NULL);
-        rtnl_register(PF_PHONET, RTM_GETADDR, NULL, getaddr_dumpit);
+        int err = __rtnl_register(PF_PHONET, RTM_NEWADDR, addr_doit, NULL);
+        if (err)
+                return err;
+
+        /* Further __rtnl_register() cannot fail */
+        __rtnl_register(PF_PHONET, RTM_DELADDR, addr_doit, NULL);
+        __rtnl_register(PF_PHONET, RTM_GETADDR, NULL, getaddr_dumpit);
+        return 0;
 }