ipv6: fix bad free of addrconf_init_net
Subsystems (3)
PATCH 1/1 ipv6: fix bad free of addrconf_init_net
Signed-off-by Hong Zhiguo <[email protected]>
--- net/ipv6/addrconf.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-)
net/ipv6/addrconf.c +10 -16
@@ -4852,26 +4852,20 @@ static void addrconf_sysctl_unregister(struct inet6_dev *idev)static int __net_init addrconf_init_net (struct net *net) { -int err; +int err = -ENOMEM ;struct ipv6_devconf *all, *dflt; - err = -ENOMEM ; - all = &ipv6_devconf; - dflt = &ipv6_devconf_dflt; + all =kmemdup (&ipv6_devconf,sizeof (ipv6_devconf),GFP_KERNEL ); +if (all ==NULL ) + goto err_alloc_all; -if (!net_eq (net, &init_net)) { - all =kmemdup (all,sizeof (ipv6_devconf),GFP_KERNEL ); -if (all ==NULL ) - goto err_alloc_all; + dflt =kmemdup (&ipv6_devconf_dflt,sizeof (ipv6_devconf_dflt),GFP_KERNEL ); +if (dflt ==NULL ) + goto err_alloc_dflt; - dflt =kmemdup (dflt,sizeof (ipv6_devconf_dflt),GFP_KERNEL ); -if (dflt ==NULL ) - goto err_alloc_dflt; - }else { -/* these will be inherited by all namespaces */ - dflt->autoconf = ipv6_defaults.autoconf; - dflt->disable_ipv6 = ipv6_defaults.disable_ipv6; - } +/* these will be inherited by all namespaces */ + dflt->autoconf = ipv6_defaults.autoconf; + dflt->disable_ipv6 = ipv6_defaults.disable_ipv6; net->ipv6.devconf_all = all; net->ipv6.devconf_dflt = dflt;
Signature · 1 line
1.7.10.4
David Miller
maintainerFrom: Hong Zhiguo <[email protected]>
Date: Tue, 26 Mar 2013 01:52:45 +0800
Quoted 1 line
Signed-off-by Hong Zhiguo <[email protected]>
Applied and queued up for -stable, thanks.