| From 66ccd8c457fde65b5570b0a620e0e2fc76726597 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 14 Jan 2020 11:39:02 +0100 |
| Subject: libertas: don't exit from lbs_ibss_join_existing() with RCU read lock |
| held |
| |
| From: Nicolai Stange <nstange@suse.de> |
| |
| [ 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> |
| --- |
| drivers/net/wireless/marvell/libertas/cfg.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| diff --git a/drivers/net/wireless/marvell/libertas/cfg.c b/drivers/net/wireless/marvell/libertas/cfg.c |
| index c9401c121a14e..68985d7663491 100644 |
| --- a/drivers/net/wireless/marvell/libertas/cfg.c |
| +++ b/drivers/net/wireless/marvell/libertas/cfg.c |
| @@ -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; |
| -- |
| 2.20.1 |
| |
