]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
libertas: don't exit from lbs_ibss_join_existing() with RCU read lock held
authorNicolai Stange <nstange@suse.de>
Tue, 14 Jan 2020 10:39:02 +0000 (11:39 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 14 Feb 2020 21:34:20 +0000 (16:34 -0500)
[ 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

index c9401c121a14e6dfd11d41aca19fb8d4f25b706b..68985d76634919a7afdd0f9d8dca0a57d4debeb4 100644 (file)
@@ -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;