net: ipv6: check return value of rhashtable_init

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>

diff --git a/net/ipv6/ila/ila_xlat.c b/net/ipv6/ila/ila_xlat.c
index a1ac0e3d8c60c52fa48d4bccb9d1cd4fadb46fa3..47447f0241df604bc657acbd9ce37008b49bacf0 100644 (file)
--- a/net/ipv6/ila/ila_xlat.c
+++ b/net/ipv6/ila/ila_xlat.c
@@ -610,7 +610,11 @@ int ila_xlat_init_net(struct net *net)
        if (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;
 }

diff --git a/net/ipv6/seg6.c b/net/ipv6/seg6.c
index e412817fba2f32ba8ecb9a7d1cde4c0c53e953d5..65744f2d38da3507232046ab44afeca38452a8cb 100644 (file)
--- a/net/ipv6/seg6.c
+++ b/net/ipv6/seg6.c
@@ -374,7 +374,11 @@ static int __net_init seg6_net_init(struct net *net)
        net->ipv6.seg6_data = sdata;
 
 #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
 
        return 0;
@@ -388,7 +392,7 @@ static void __net_exit seg6_net_exit(struct net *net)
        seg6_hmac_net_exit(net);
 #endif
 
-       kfree(sdata->tun_src);
+       kfree(rcu_dereference_raw(sdata->tun_src));
        kfree(sdata);
 }
 

diff --git a/net/ipv6/seg6_hmac.c b/net/ipv6/seg6_hmac.c
index 687d95dce08522bebf6d0c3b0473cb8eb3f2a17d..29bc4e7c3046e2cc2a395ccf2cb452428df72790 100644 (file)
--- a/net/ipv6/seg6_hmac.c
+++ b/net/ipv6/seg6_hmac.c
@@ -405,9 +405,7 @@ int __net_init seg6_hmac_net_init(struct net *net)
 {
        struct seg6_pernet_data *sdata = seg6_pernet(net);
 
-       rhashtable_init(&sdata->hmac_infos, &rht_params);
-
-       return 0;
+       return rhashtable_init(&sdata->hmac_infos, &rht_params);
 }
 EXPORT_SYMBOL(seg6_hmac_net_init);