alex/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: ipv6: check return value of rhashtable_init

Browse Source 
When rhashtable_init() fails, it returns -EINVAL.
However, since error return value of rhashtable_init is not checked,
it can cause use of uninitialized pointers.
So, fix unhandled errors of rhashtable_init.

Signed-off-by: MichelleJin <shjy180909@gmail.com>
Reviewed-by: David Ahern <dsahern@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
MichelleJin 2021-09-27 03:34:56 +00:00 committed by David S. Miller
parent d7cade5137
commit f04ed7d277
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/ipv6/ila/ila_xlat.c
View File

@ -610,7 +610,11 @@ int ila_xlat_init_net(struct net *net)
if (err) if (err)
return err; return err;
rhashtable_init(&ilan->xlat.rhash_table, &rht_params); err = rhashtable_init(&ilan->xlat.rhash_table, &rht_params);
if (err) {
free_bucket_spinlocks(ilan->xlat.locks);
return err;
}
return 0; return 0;
} }

8
net/ipv6/seg6.c
View File

@ -374,7 +374,11 @@ static int __net_init seg6_net_init(struct net *net)
net->ipv6.seg6_data = sdata; net->ipv6.seg6_data = sdata;
#ifdef CONFIG_IPV6_SEG6_HMAC #ifdef CONFIG_IPV6_SEG6_HMAC
seg6_hmac_net_init(net); if (seg6_hmac_net_init(net)) {
kfree(sdata);
kfree(rcu_dereference_raw(sdata->tun_src));
return -ENOMEM;
};
#endif #endif
return 0; return 0;
@ -388,7 +392,7 @@ static void __net_exit seg6_net_exit(struct net *net)
seg6_hmac_net_exit(net); seg6_hmac_net_exit(net);
#endif #endif
kfree(sdata->tun_src); kfree(rcu_dereference_raw(sdata->tun_src));
kfree(sdata); kfree(sdata);
} }

4
net/ipv6/seg6_hmac.c
View File

@ -405,9 +405,7 @@ int __net_init seg6_hmac_net_init(struct net *net)
{ {
struct seg6_pernet_data *sdata = seg6_pernet(net); struct seg6_pernet_data *sdata = seg6_pernet(net);
rhashtable_init(&sdata->hmac_infos, &rht_params); return rhashtable_init(&sdata->hmac_infos, &rht_params);
return 0;
} }
EXPORT_SYMBOL(seg6_hmac_net_init); EXPORT_SYMBOL(seg6_hmac_net_init);