mac80211: mesh: fix missing unlock on error in table_path_del()

Wei Yongjun · davem330 · commit f2ffff085d28 · 2019-02-18T16:29:54.000-08:00
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: b4c3fbe ("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>
diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c
@@ -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;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -627,7 +627,7 @@ static int table_path_del(struct mesh_table *tbl,`
`627`	`627`	`spin_lock_bh(&tbl->walk_lock);`
`628`	`628`	`mpath = rhashtable_lookup_fast(&tbl->rhead, addr, mesh_rht_params);`
`629`	`629`	`if (!mpath) {`
`630`		`- rcu_read_unlock();`
	`630`	`+ spin_unlock_bh(&tbl->walk_lock);`
`631`	`631`	`return -ENXIO;`
`632`	`632`	`}`
`633`	`633`