Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6965c44 authored by Javier Cardona's avatar Javier Cardona Committed by John W. Linville
Browse files

mac80211: mesh locking fixes 



mesh_queue_preq is invoked invoked from both user (work queue) and
softirq (timer) context, so the _bh version of spinlock needs to be
used. Also, the mpath->state_lock should be softirq safe as well.

Signed-off-by: default avatarJavier Cardona <javier@cozybit.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 86d7f9f3

net/mac80211/mesh_pathtbl.c

+2 −2
Original line number Diff line number Diff line
@@ -654,12 +654,12 @@ int mesh_path_del(u8 *addr, struct ieee80211_sub_if_data *sdata) 
		mpath = node->mpath;

		if (mpath->sdata == sdata &&

		    memcmp(addr, mpath->dst, ETH_ALEN) == 0) {

			spin_lock(&mpath->state_lock);

			spin_lock_bh(&mpath->state_lock);

			mpath->flags |= MESH_PATH_RESOLVING;

			hlist_del_rcu(&node->list);

			call_rcu(&node->rcu, mesh_path_node_reclaim);

			atomic_dec(&tbl->entries);

			spin_unlock(&mpath->state_lock);

			spin_unlock_bh(&mpath->state_lock);

			goto enddel;

		}

	}