| Message ID | 20200114103903.2336-3-nstange@suse.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 1754c4f60aaf1e17d886afefee97e94d7f27b4cb |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | libertas: fix rates overflow code path in lbs_ibss_join_existing() | expand |
Nicolai Stange <nstange@suse.de> writes: > 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") This should be in one line, I'll fix it during commit.
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;
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> --- drivers/net/wireless/marvell/libertas/cfg.c | 1 + 1 file changed, 1 insertion(+)