On Thu, May 8, 2014 at 3:55 PM, Wang Weidong <wangweidong1@xxxxxxxxxx> wrote: > When register_net_sysctl failed, we should free the > sysctl_table while the net_namespace is not init_net. > > Signed-off-by: Wang Weidong <wangweidong1@xxxxxxxxxx> > --- > net/sctp/sysctl.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/net/sctp/sysctl.c b/net/sctp/sysctl.c > index 844d2b0..4c17694 100644 > --- a/net/sctp/sysctl.c > +++ b/net/sctp/sysctl.c > @@ -450,6 +450,11 @@ int sctp_sysctl_net_register(struct net *net) > } > > net->sctp.sysctl_header = register_net_sysctl(net, "net/sctp", table); > + if (net->sctp.sysctl_header == NULL) { > + if (!net_eq(net, &init_net)) > + kfree(table); > + return -ENOMEM; > + } > return 0; > } > Hope to resolve the problem of sctp_sysctl_net_unregister() in one patch! kfree(table) should check net namesapce. diff --git a/net/sctp/sysctl.c b/net/sctp/sysctl.c index c82fdc1..844d2b0 100644 --- a/net/sctp/sysctl.c +++ b/net/sctp/sysctl.c @@ -459,7 +459,8 @@ void sctp_sysctl_net_unregister(struct net *net) table = net->sctp.sysctl_header->ctl_table_arg; unregister_net_sysctl_table(net->sctp.sysctl_header); - kfree(table); + if (!net_eq(net, &init_net)) + kfree(table); } static struct ctl_table_header *sctp_sysctl_header; Thanks Tingwei Liu > -- > 1.7.12 > > > -- > To unsubscribe from this list: send the line "unsubscribe netdev" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-sctp" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html