cpufreq: CPPC: Don't set transition_latency

[mirror_ubuntu-bionic-kernel.git] / net / ipv4 / ipmr.c

diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index fd5f19c988e48a00e5447f5504bd670326ef7939..e86322a0699f4a57aff78cf017457b97cdd5581e 100644 (file)
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -356,6 +356,7 @@ static const struct rhashtable_params ipmr_rht_params = {
 static struct mr_table *ipmr_new_table(struct net *net, u32 id)
 {
        struct mr_table *mrt;
+       int err;
 
        /* "pimreg%u" should not exceed 16 bytes (IFNAMSIZ) */
        if (id != RT_TABLE_DEFAULT && id >= 1000000000)
@@ -371,7 +372,11 @@ static struct mr_table *ipmr_new_table(struct net *net, u32 id)
        write_pnet(&mrt->net, net);
        mrt->id = id;
 
-       rhltable_init(&mrt->mfc_hash, &ipmr_rht_params);
+       err = rhltable_init(&mrt->mfc_hash, &ipmr_rht_params);
+       if (err) {
+               kfree(mrt);
+               return ERR_PTR(err);
+       }
        INIT_LIST_HEAD(&mrt->mfc_cache_list);
        INIT_LIST_HEAD(&mrt->mfc_unres_queue);