projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5a3d373
)
wl1251: Fix possible buffer overflow in wl1251_cmd_scan
author
Lee Gibson
<leegib@gmail.com>
Wed, 28 Apr 2021 11:55:08 +0000
(12:55 +0100)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Mon, 19 Jul 2021 07:44:50 +0000
(09:44 +0200)
[ Upstream commit
d10a87a3535cce2b890897914f5d0d83df669c63
]
Function wl1251_cmd_scan calls memcpy without checking the length.
Harden by checking the length is within the maximum allowed size.
Signed-off-by: Lee Gibson <leegib@gmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link:
https://lore.kernel.org/r/20210428115508.25624-1-leegib@gmail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wireless/ti/wl1251/cmd.c
patch
|
blob
|
history
diff --git
a/drivers/net/wireless/ti/wl1251/cmd.c
b/drivers/net/wireless/ti/wl1251/cmd.c
index
9547aea
..
ea02152
100644
(file)
--- a/
drivers/net/wireless/ti/wl1251/cmd.c
+++ b/
drivers/net/wireless/ti/wl1251/cmd.c
@@
-466,9
+466,12
@@
int wl1251_cmd_scan(struct wl1251 *wl, u8 *ssid, size_t ssid_len,
cmd->channels[i].channel = channels[i]->hw_value;
}
- cmd->params.ssid_len = ssid_len;
- if (ssid)
- memcpy(cmd->params.ssid, ssid, ssid_len);
+ if (ssid) {
+ int len = clamp_val(ssid_len, 0, IEEE80211_MAX_SSID_LEN);
+
+ cmd->params.ssid_len = len;
+ memcpy(cmd->params.ssid, ssid, len);
+ }
ret = wl1251_cmd_send(wl, CMD_SCAN, cmd, sizeof(*cmd));
if (ret < 0) {