* [PATCH] qtnfmac: Fix possible buffer overflow in qtnf_event_handle_external_auth
@ 2021-03-17 12:17 Lee Gibson
2021-04-17 17:24 ` Kalle Valo
2021-04-19 14:58 ` [PATCH v2] " Lee Gibson
0 siblings, 2 replies; 4+ messages in thread
From: Lee Gibson @ 2021-03-17 12:17 UTC (permalink / raw)
To: imitsyanko
Cc: kvalo, davem, kuba, linux-wireless, netdev, linux-kernel, Lee Gibson
Function qtnf_event_handle_external_auth calls memcpy without
checking the length.
A user could control that length and trigger a buffer overflow.
Fix by checking the length is within the maximum allowed size.
Signed-off-by: Lee Gibson <leegib@gmail.com>
---
drivers/net/wireless/quantenna/qtnfmac/event.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/quantenna/qtnfmac/event.c b/drivers/net/wireless/quantenna/qtnfmac/event.c
index c775c177933b..ce920685055a 100644
--- a/drivers/net/wireless/quantenna/qtnfmac/event.c
+++ b/drivers/net/wireless/quantenna/qtnfmac/event.c
@@ -570,8 +570,10 @@ qtnf_event_handle_external_auth(struct qtnf_vif *vif,
return 0;
if (ev->ssid_len) {
- memcpy(auth.ssid.ssid, ev->ssid, ev->ssid_len);
- auth.ssid.ssid_len = ev->ssid_len;
+ int len = min_t(int, ev->ssid_len, IEEE80211_MAX_SSID_LEN);
+
+ memcpy(auth.ssid.ssid, ev->ssid, len);
+ auth.ssid.ssid_len = len;
}
auth.key_mgmt_suite = le32_to_cpu(ev->akm_suite);
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] qtnfmac: Fix possible buffer overflow in qtnf_event_handle_external_auth
2021-03-17 12:17 [PATCH] qtnfmac: Fix possible buffer overflow in qtnf_event_handle_external_auth Lee Gibson
@ 2021-04-17 17:24 ` Kalle Valo
2021-04-19 14:58 ` [PATCH v2] " Lee Gibson
1 sibling, 0 replies; 4+ messages in thread
From: Kalle Valo @ 2021-04-17 17:24 UTC (permalink / raw)
To: Lee Gibson
Cc: imitsyanko, davem, kuba, linux-wireless, netdev, linux-kernel,
Lee Gibson
Lee Gibson <leegib@gmail.com> wrote:
> Function qtnf_event_handle_external_auth calls memcpy without
> checking the length.
> A user could control that length and trigger a buffer overflow.
> Fix by checking the length is within the maximum allowed size.
>
> Signed-off-by: Lee Gibson <leegib@gmail.com>
Please use clamp_val() instead, that's preferred over min_t().
Patch set to Changes Requested.
--
https://patchwork.kernel.org/project/linux-wireless/patch/20210317121706.389058-1-leegib@gmail.com/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2] qtnfmac: Fix possible buffer overflow in qtnf_event_handle_external_auth
2021-03-17 12:17 [PATCH] qtnfmac: Fix possible buffer overflow in qtnf_event_handle_external_auth Lee Gibson
2021-04-17 17:24 ` Kalle Valo
@ 2021-04-19 14:58 ` Lee Gibson
2021-04-22 14:40 ` Kalle Valo
1 sibling, 1 reply; 4+ messages in thread
From: Lee Gibson @ 2021-04-19 14:58 UTC (permalink / raw)
To: kvalo
Cc: imitsyanko, davem, kuba, linux-wireless, netdev, linux-kernel,
Lee Gibson
Function qtnf_event_handle_external_auth calls memcpy without
checking the length.
A user could control that length and trigger a buffer overflow.
Fix by checking the length is within the maximum allowed size.
Signed-off-by: Lee Gibson <leegib@gmail.com>
---
v2: use clamp_val() instead of min_t()
drivers/net/wireless/quantenna/qtnfmac/event.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/quantenna/qtnfmac/event.c b/drivers/net/wireless/quantenna/qtnfmac/event.c
index c775c177933b..8dc80574d08d 100644
--- a/drivers/net/wireless/quantenna/qtnfmac/event.c
+++ b/drivers/net/wireless/quantenna/qtnfmac/event.c
@@ -570,8 +570,10 @@ qtnf_event_handle_external_auth(struct qtnf_vif *vif,
return 0;
if (ev->ssid_len) {
- memcpy(auth.ssid.ssid, ev->ssid, ev->ssid_len);
- auth.ssid.ssid_len = ev->ssid_len;
+ int len = clamp_val(ev->ssid_len, 0, IEEE80211_MAX_SSID_LEN);
+
+ memcpy(auth.ssid.ssid, ev->ssid, len);
+ auth.ssid.ssid_len = len;
}
auth.key_mgmt_suite = le32_to_cpu(ev->akm_suite);
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] qtnfmac: Fix possible buffer overflow in qtnf_event_handle_external_auth
2021-04-19 14:58 ` [PATCH v2] " Lee Gibson
@ 2021-04-22 14:40 ` Kalle Valo
0 siblings, 0 replies; 4+ messages in thread
From: Kalle Valo @ 2021-04-22 14:40 UTC (permalink / raw)
To: Lee Gibson
Cc: imitsyanko, davem, kuba, linux-wireless, netdev, linux-kernel,
Lee Gibson
Lee Gibson <leegib@gmail.com> wrote:
> Function qtnf_event_handle_external_auth calls memcpy without
> checking the length.
> A user could control that length and trigger a buffer overflow.
> Fix by checking the length is within the maximum allowed size.
>
> Signed-off-by: Lee Gibson <leegib@gmail.com>
Patch applied to wireless-drivers-next.git, thanks.
130f634da1af qtnfmac: Fix possible buffer overflow in qtnf_event_handle_external_auth
--
https://patchwork.kernel.org/project/linux-wireless/patch/20210419145842.345787-1-leegib@gmail.com/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-04-22 14:41 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-17 12:17 [PATCH] qtnfmac: Fix possible buffer overflow in qtnf_event_handle_external_auth Lee Gibson
2021-04-17 17:24 ` Kalle Valo
2021-04-19 14:58 ` [PATCH v2] " Lee Gibson
2021-04-22 14:40 ` Kalle Valo
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.