From: Sasha Levin Date: Thu, 7 Jan 2021 14:21:46 +0000 (-0500) Subject: Fixes for 5.4 X-Git-Tag: v4.4.250~5 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5f49b8a2589a96bb40685b09d1717112213a8378;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 5.4 Signed-off-by: Sasha Levin --- diff --git a/queue-5.4/mwifiex-fix-possible-buffer-overflows-in-mwifiex_cmd.patch b/queue-5.4/mwifiex-fix-possible-buffer-overflows-in-mwifiex_cmd.patch new file mode 100644 index 00000000000..d0dfe21fc74 --- /dev/null +++ b/queue-5.4/mwifiex-fix-possible-buffer-overflows-in-mwifiex_cmd.patch @@ -0,0 +1,40 @@ +From b28bbddbfdbe1e3a994e57dba23a3795cbc2bdf2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 6 Dec 2020 16:48:01 +0800 +Subject: mwifiex: Fix possible buffer overflows in + mwifiex_cmd_802_11_ad_hoc_start + +From: Zhang Xiaohui + +[ Upstream commit 5c455c5ab332773464d02ba17015acdca198f03d ] + +mwifiex_cmd_802_11_ad_hoc_start() calls memcpy() without checking +the destination size may trigger a buffer overflower, +which a local user could use to cause denial of service +or the execution of arbitrary code. +Fix it by putting the length check before calling memcpy(). + +Signed-off-by: Zhang Xiaohui +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/20201206084801.26479-1-ruc_zhangxiaohui@163.com +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/marvell/mwifiex/join.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/net/wireless/marvell/mwifiex/join.c b/drivers/net/wireless/marvell/mwifiex/join.c +index d87aeff70cefb..c2cb1e711c06e 100644 +--- a/drivers/net/wireless/marvell/mwifiex/join.c ++++ b/drivers/net/wireless/marvell/mwifiex/join.c +@@ -877,6 +877,8 @@ mwifiex_cmd_802_11_ad_hoc_start(struct mwifiex_private *priv, + + memset(adhoc_start->ssid, 0, IEEE80211_MAX_SSID_LEN); + ++ if (req_ssid->ssid_len > IEEE80211_MAX_SSID_LEN) ++ req_ssid->ssid_len = IEEE80211_MAX_SSID_LEN; + memcpy(adhoc_start->ssid, req_ssid->ssid, req_ssid->ssid_len); + + mwifiex_dbg(adapter, INFO, "info: ADHOC_S_CMD: SSID = %s\n", +-- +2.27.0 + diff --git a/queue-5.4/series b/queue-5.4/series index 30f5c86a44d..d4b42248587 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -10,3 +10,4 @@ perf-break-deadlock-involving-exec_update_mutex.patch rwsem-implement-down_read_killable_nested.patch rwsem-implement-down_read_interruptible.patch exec-transform-exec_update_mutex-into-a-rw_semaphore.patch +mwifiex-fix-possible-buffer-overflows-in-mwifiex_cmd.patch