Commit 1de085c8 authored Jan 14, 2020 by Nicolai Stange Committed by Greg Kroah-Hartman Feb 14, 2020

libertas: make lbs_ibss_join_existing() return error code on rates overflow



[ Upstream commit 1754c4f60aaf1e17d886afefee97e94d7f27b4cb ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 8ffeb211

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -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;