Commit 8ffeb211 authored Jan 14, 2020 by Nicolai Stange Committed by Greg Kroah-Hartman Feb 14, 2020

libertas: don't exit from lbs_ibss_join_existing() with RCU read lock held



[ Upstream commit c7bf1fb7ddca331780b9a733ae308737b39f1ad4 ]

Commit e5e884b42639 ("libertas: Fix two buffer overflows at parsing bss
descriptor") introduced a bounds check on the number of supplied rates to
lbs_ibss_join_existing().

Unfortunately, it introduced a return path from within a RCU read side
critical section without a corresponding rcu_read_unlock(). Fix this.

Fixes: e5e884b42639 ("libertas: Fix two buffer overflows at parsing bss descriptor")
Signed-off-by: Nicolai Stange <nstange@suse.de>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 48247f7e

drivers/net/wireless/marvell/libertas/cfg.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -1785,6 +1785,7 @@ static int lbs_ibss_join_existing(struct lbs_private *priv,
		rates_max = rates_eid[1];
		if (rates_max > MAX_RATES) {
		lbs_deb_join("invalid rates");
		rcu_read_unlock();
		goto out;
		}
		rates = cmd.bss.rates;