Patch "mac80211: check return value of rhashtable_init" has been added to the 5.14-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    mac80211: check return value of rhashtable_init

to the 5.14-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     mac80211-check-return-value-of-rhashtable_init.patch
and it can be found in the queue-5.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 6c0353af9164400deb9168407fb607a1436cd9cf
Author: MichelleJin <shjy180909@xxxxxxxxx>
Date:   Mon Sep 27 03:34:57 2021 +0000

    mac80211: check return value of rhashtable_init
    
    [ Upstream commit 111461d573741c17eafad029ac93474fa9adcce0 ]
    
    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@xxxxxxxxx>
    Link: https://lore.kernel.org/r/20210927033457.1020967-4-shjy180909@xxxxxxxxx
    Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c
index efbefcbac3ac..7cab1cf09bf1 100644
--- a/net/mac80211/mesh_pathtbl.c
+++ b/net/mac80211/mesh_pathtbl.c
@@ -60,7 +60,10 @@ static struct mesh_table *mesh_table_alloc(void)
 	atomic_set(&newtbl->entries,  0);
 	spin_lock_init(&newtbl->gates_lock);
 	spin_lock_init(&newtbl->walk_lock);
-	rhashtable_init(&newtbl->rhead, &mesh_rht_params);
+	if (rhashtable_init(&newtbl->rhead, &mesh_rht_params)) {
+		kfree(newtbl);
+		return NULL;
+	}
 
 	return newtbl;
 }