]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
mac80211: mesh: fix missing unlock on error in table_path_del()
authorWei Yongjun <weiyongjun1@huawei.com>
Mon, 18 Feb 2019 10:29:29 +0000 (11:29 +0100)
committerDavid S. Miller <davem@davemloft.net>
Tue, 19 Feb 2019 00:29:54 +0000 (16:29 -0800)
spin_lock_bh() is used in table_path_del() but rcu_read_unlock()
is used for unlocking. Fix it by using spin_unlock_bh() instead
of rcu_read_unlock() in the error handling case.

Fixes: b4c3fbe63601 ("mac80211: Use linked list instead of rhashtable walk for mesh tables")
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/mac80211/mesh_pathtbl.c

index c3a7396fb9556ab07ff2bddeae47789ee0ba9ffc..88a6d5e18ccc9e13d20af8736f82ed6fa42a8ce5 100644 (file)
@@ -627,7 +627,7 @@ static int table_path_del(struct mesh_table *tbl,
        spin_lock_bh(&tbl->walk_lock);
        mpath = rhashtable_lookup_fast(&tbl->rhead, addr, mesh_rht_params);
        if (!mpath) {
-               rcu_read_unlock();
+               spin_unlock_bh(&tbl->walk_lock);
                return -ENXIO;
        }