git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cf29311
)
ipv6: fix bad free of addrconf_init_net
author
Hong Zhiguo
<honkiko@gmail.com>
Mon, 25 Mar 2013 17:52:45 +0000
(
01:52
+0800)
committer
Ben Hutchings
<ben@decadent.org.uk>
Wed, 10 Apr 2013 02:20:14 +0000
(
03:20
+0100)
[ Upstream commit
a79ca223e029aa4f09abb337accf1812c900a800
]
Signed-off-by: Hong Zhiguo <honkiko@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
net/ipv6/addrconf.c
patch
|
blob
|
history
diff --git
a/net/ipv6/addrconf.c
b/net/ipv6/addrconf.c
index
b27baed
..
8589c2d
100644
(file)
--- a/
net/ipv6/addrconf.c
+++ b/
net/ipv6/addrconf.c
@@
-4658,26
+4658,20
@@
static void addrconf_sysctl_unregister(struct inet6_dev *idev)
static int __net_init addrconf_init_net(struct net *net)
{
static int __net_init addrconf_init_net(struct net *net)
{
- int err;
+ int err
= -ENOMEM
;
struct ipv6_devconf *all, *dflt;
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;
net->ipv6.devconf_all = all;
net->ipv6.devconf_dflt = dflt;