Skip to content

Commit e255e11

Browse files
Wang Haikuba-moo
authored andcommitted
ipv6: addrlabel: fix possible memory leak in ip6addrlbl_net_init
kmemleak report a memory leak as follows: unreferenced object 0xffff8880059c6a00 (size 64): comm "ip", pid 23696, jiffies 4296590183 (age 1755.384s) hex dump (first 32 bytes): 20 01 00 10 00 00 00 00 00 00 00 00 00 00 00 00 ............... 1c 00 00 00 00 00 00 00 00 00 00 00 07 00 00 00 ................ backtrace: [<00000000aa4e7a87>] ip6addrlbl_add+0x90/0xbb0 [<0000000070b8d7f1>] ip6addrlbl_net_init+0x109/0x170 [<000000006a9ca9d4>] ops_init+0xa8/0x3c0 [<000000002da57bf2>] setup_net+0x2de/0x7e0 [<000000004e52d573>] copy_net_ns+0x27d/0x530 [<00000000b07ae2b4>] create_new_namespaces+0x382/0xa30 [<000000003b76d36f>] unshare_nsproxy_namespaces+0xa1/0x1d0 [<0000000030653721>] ksys_unshare+0x3a4/0x780 [<0000000007e82e40>] __x64_sys_unshare+0x2d/0x40 [<0000000031a10c08>] do_syscall_64+0x33/0x40 [<0000000099df30e7>] entry_SYSCALL_64_after_hwframe+0x44/0xa9 We should free all rules when we catch an error in ip6addrlbl_net_init(). otherwise a memory leak will occur. Fixes: 2a8cc6c ("[IPV6] ADDRCONF: Support RFC3484 configurable address selection policy table.") Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Wang Hai <wanghai38@huawei.com> Link: https://lore.kernel.org/r/20201124071728.8385-1-wanghai38@huawei.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 6f7a1f9 commit e255e11

1 file changed

Lines changed: 17 additions & 9 deletions

File tree

net/ipv6/addrlabel.c

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,9 @@ static int ip6addrlbl_del(struct net *net,
306306
/* add default label */
307307
static int __net_init ip6addrlbl_net_init(struct net *net)
308308
{
309-
int err = 0;
309+
struct ip6addrlbl_entry *p = NULL;
310+
struct hlist_node *n;
311+
int err;
310312
int i;
311313

312314
ADDRLABEL(KERN_DEBUG "%s\n", __func__);
@@ -315,14 +317,20 @@ static int __net_init ip6addrlbl_net_init(struct net *net)
315317
INIT_HLIST_HEAD(&net->ipv6.ip6addrlbl_table.head);
316318

317319
for (i = 0; i < ARRAY_SIZE(ip6addrlbl_init_table); i++) {
318-
int ret = ip6addrlbl_add(net,
319-
ip6addrlbl_init_table[i].prefix,
320-
ip6addrlbl_init_table[i].prefixlen,
321-
0,
322-
ip6addrlbl_init_table[i].label, 0);
323-
/* XXX: should we free all rules when we catch an error? */
324-
if (ret && (!err || err != -ENOMEM))
325-
err = ret;
320+
err = ip6addrlbl_add(net,
321+
ip6addrlbl_init_table[i].prefix,
322+
ip6addrlbl_init_table[i].prefixlen,
323+
0,
324+
ip6addrlbl_init_table[i].label, 0);
325+
if (err)
326+
goto err_ip6addrlbl_add;
327+
}
328+
return 0;
329+
330+
err_ip6addrlbl_add:
331+
hlist_for_each_entry_safe(p, n, &net->ipv6.ip6addrlbl_table.head, list) {
332+
hlist_del_rcu(&p->list);
333+
kfree_rcu(p, rcu);
326334
}
327335
return err;
328336
}

0 commit comments

Comments
 (0)