From 8ed9d6300d8cd0087faeb58fee84c062573a9923 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Thu, 7 Jan 2021 09:21:48 -0500 Subject: [PATCH] Fixes for 4.9 Signed-off-by: Sasha Levin --- ...ible-buffer-overflows-in-mwifiex_cmd.patch | 40 +++++++++++++++++++ queue-4.9/series | 1 + 2 files changed, 41 insertions(+) create mode 100644 queue-4.9/mwifiex-fix-possible-buffer-overflows-in-mwifiex_cmd.patch diff --git a/queue-4.9/mwifiex-fix-possible-buffer-overflows-in-mwifiex_cmd.patch b/queue-4.9/mwifiex-fix-possible-buffer-overflows-in-mwifiex_cmd.patch new file mode 100644 index 00000000000..b180176285d --- /dev/null +++ b/queue-4.9/mwifiex-fix-possible-buffer-overflows-in-mwifiex_cmd.patch @@ -0,0 +1,40 @@ +From 50215d707a5277d05fc596492a707601ec5ea583 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 b89596c18b41a..313b5d9fd08ed 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-4.9/series b/queue-4.9/series index 5b86615fc27..781ac4ff247 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -30,3 +30,4 @@ iio-bmi160_core-fix-sparse-warning-due-to-incorrect-type-in-assignment.patch iio-imu-bmi160-fix-too-large-a-buffer.patch iio-imu-bmi160-fix-alignment-and-data-leak-issues.patch iio-magnetometer-mag3110-fix-alignment-and-data-leak-issues.patch +mwifiex-fix-possible-buffer-overflows-in-mwifiex_cmd.patch -- 2.47.3