From mboxrd@z Thu Jan 1 00:00:00 1970 From: Neil Horman Date: Thu, 08 May 2014 11:11:26 +0000 Subject: Re: [PATCH net-next] sctp: add a checking for sctp_sysctl_net_register Message-Id: <20140508111126.GC9696@hmsreliant.think-freely.org> List-Id: References: <536B3859.2050908@huawei.com> In-Reply-To: <536B3859.2050908@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Wang Weidong Cc: David Miller , Vlad Yasevich , Daniel Borkmann , linux-sctp@vger.kernel.org, netdev@vger.kernel.org On Thu, May 08, 2014 at 03:55:05PM +0800, Wang Weidong 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 > --- > 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; > + } Sorry, we're not special casing this in 3 places. Why not just revert the origonal commit so that all the sysctl tables can be handled the same way Neil > return 0; > } > > -- > 1.7.12 > > >