Merge branch 'sctp_sysctl'

Wang Weidong says:

====================
sctp: fix kfree static array pointer in sctp_sysctl_net_unregister

patch #1 revert the efb842c45("sctp: optimize the sctp_sysctl_net_register")
patch #2 add a checking for sctp_sysctl_net_register
====================

Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 11 insertions, 10 deletions

diff --git a/net/sctp/sysctl.c b/net/sctp/sysctl.c
index c82fdc1eab7c..7e5eb7554990 100644
--- a/net/sctp/sysctl.c
+++ b/net/sctp/sysctl.c
@@ -436,20 +436,21 @@ static int proc_sctp_do_auth(struct ctl_table *ctl, int write,
 
 int sctp_sysctl_net_register(struct net *net)
 {
-        struct ctl_table *table = sctp_net_table;
-
-        if (!net_eq(net, &init_net)) {
-                int i;
+        struct ctl_table *table;
+        int i;
 
-                table = kmemdup(sctp_net_table, sizeof(sctp_net_table), GFP_KERNEL);
-                if (!table)
-                        return -ENOMEM;
+        table = kmemdup(sctp_net_table, sizeof(sctp_net_table), GFP_KERNEL);
+        if (!table)
+                return -ENOMEM;
 
-                for (i = 0; table[i].data; i++)
-                        table[i].data += (char *)(&net->sctp) - (char *)&init_net.sctp;
-        }
+        for (i = 0; table[i].data; i++)
+                table[i].data += (char *)(&net->sctp) - (char *)&init_net.sctp;
 
         net->sctp.sysctl_header = register_net_sysctl(net, "net/sctp", table);
+        if (net->sctp.sysctl_header == NULL) {
+                kfree(table);
+                return -ENOMEM;
+        }
         return 0;
 }