Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a79ca223 authored by Hong Zhiguo's avatar Hong Zhiguo Committed by David S. Miller
Browse files

ipv6: fix bad free of addrconf_init_net 



Signed-off-by: default avatarHong Zhiguo <honkiko@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ded34e0f

net/ipv6/addrconf.c

+10 −16
Original line number Diff line number Diff line
@@ -4784,26 +4784,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;



	if (!net_eq(net, &init_net)) {

		all = kmemdup(all, sizeof(ipv6_devconf), GFP_KERNEL);

	all = kmemdup(&ipv6_devconf, sizeof(ipv6_devconf), GFP_KERNEL);

	if (all == NULL)

		goto err_alloc_all;



		dflt = kmemdup(dflt, sizeof(ipv6_devconf_dflt), GFP_KERNEL);

	dflt = kmemdup(&ipv6_devconf_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;

	}



	net->ipv6.devconf_all = all;

	net->ipv6.devconf_dflt = dflt;