These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / net / sysctl_net.c

diff --git a/kernel/net/sysctl_net.c b/kernel/net/sysctl_net.c
index e7000be..ed98c1f 100644 (file)
--- a/kernel/net/sysctl_net.c
+++ b/kernel/net/sysctl_net.c
@@ -94,10 +94,14 @@ __init int net_sysctl_init(void)
                goto out;
        ret = register_pernet_subsys(&sysctl_pernet_ops);
        if (ret)
-               goto out;
+               goto out1;
        register_sysctl_root(&net_sysctl_root);
 out:
        return ret;
+out1:
+       unregister_sysctl_table(net_header);
+       net_header = NULL;
+       goto out;
 }
 
 struct ctl_table_header *register_net_sysctl(struct net *net,