]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
qtnfmac: Fix possible buffer overflow in qtnf_event_handle_external_auth
authorLee Gibson <leegib@gmail.com>
Mon, 19 Apr 2021 14:58:42 +0000 (15:58 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 19 May 2021 08:08:24 +0000 (10:08 +0200)
[ Upstream commit 130f634da1af649205f4a3dd86cbe5c126b57914 ]

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>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210419145842.345787-1-leegib@gmail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wireless/quantenna/qtnfmac/event.c

index 7846383c88283fef3719dbda9200b4b635342740..3f24dbdae8d0ed508ff7dcbe4c68d81e162c7b78 100644 (file)
@@ -599,8 +599,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);