summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/marvell/libertas
diff options
context:
space:
mode:
authorNicolai Stange <nstange@suse.de>2020-01-14 11:39:03 +0100
committerKalle Valo <kvalo@codeaurora.org>2020-01-27 15:36:33 +0100
commit1754c4f60aaf1e17d886afefee97e94d7f27b4cb (patch)
treeb14a95097d757bf182854e8eb54001cbbda83dfb /drivers/net/wireless/marvell/libertas
parentlibertas: don't exit from lbs_ibss_join_existing() with RCU read lock held (diff)
downloadlinux-1754c4f60aaf1e17d886afefee97e94d7f27b4cb.tar.xz
linux-1754c4f60aaf1e17d886afefee97e94d7f27b4cb.zip
libertas: make lbs_ibss_join_existing() return error code on rates overflow
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() and made it to return on overflow. However, the aforementioned commit doesn't set the return value accordingly and thus, lbs_ibss_join_existing() would return with zero even though it failed. Make lbs_ibss_join_existing return -EINVAL in case the bounds check on the number of supplied rates fails. 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>
Diffstat (limited to 'drivers/net/wireless/marvell/libertas')
-rw-r--r--drivers/net/wireless/marvell/libertas/cfg.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/marvell/libertas/cfg.c b/drivers/net/wireless/marvell/libertas/cfg.c
index 68985d766349..4e3de684928b 100644
--- a/drivers/net/wireless/marvell/libertas/cfg.c
+++ b/drivers/net/wireless/marvell/libertas/cfg.c
@@ -1786,6 +1786,7 @@ static int lbs_ibss_join_existing(struct lbs_private *priv,
if (rates_max > MAX_RATES) {
lbs_deb_join("invalid rates");
rcu_read_unlock();
+ ret = -EINVAL;
goto out;
}
rates = cmd.bss.rates;