This is a note to let you know that I've just added the patch titled
staging: ks7010: potential buffer overflow in ks_wlan_set_encode_ext()
to the 5.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
staging-ks7010-potential-buffer-overflow-in-ks_wlan_set_encode_ext.patch
and it can be found in the queue-5.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 5f1c7031e044cb2fba82836d55cc235e2ad619dc Mon Sep 17 00:00:00 2001
From: Zhang Shurong <zhang_shurong@xxxxxxxxxxx>
Date: Sun, 9 Jul 2023 13:50:07 +0800
Subject: staging: ks7010: potential buffer overflow in ks_wlan_set_encode_ext()
From: Zhang Shurong <zhang_shurong@xxxxxxxxxxx>
commit 5f1c7031e044cb2fba82836d55cc235e2ad619dc upstream.
The "exc->key_len" is a u16 that comes from the user. If it's over
IW_ENCODING_TOKEN_MAX (64) that could lead to memory corruption.
Fixes: b121d84882b9 ("staging: ks7010: simplify calls to memcpy()")
Cc: stable <stable@xxxxxxxxxx>
Signed-off-by: Zhang Shurong <zhang_shurong@xxxxxxxxxxx>
Reviewed-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Link: https://lore.kernel.org/r/tencent_5153B668C0283CAA15AA518325346E026A09@xxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/staging/ks7010/ks_wlan_net.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--- a/drivers/staging/ks7010/ks_wlan_net.c
+++ b/drivers/staging/ks7010/ks_wlan_net.c
@@ -1584,8 +1584,10 @@ static int ks_wlan_set_encode_ext(struct
commit |= SME_WEP_FLAG;
}
if (enc->key_len) {
- memcpy(&key->key_val[0], &enc->key[0], enc->key_len);
- key->key_len = enc->key_len;
+ int key_len = clamp_val(enc->key_len, 0, IW_ENCODING_TOKEN_MAX);
+
+ memcpy(&key->key_val[0], &enc->key[0], key_len);
+ key->key_len = key_len;
commit |= (SME_WEP_VAL1 << index);
}
break;
Patches currently in stable-queue which might be from zhang_shurong@xxxxxxxxxxx are
queue-5.4/staging-ks7010-potential-buffer-overflow-in-ks_wlan_set_encode_ext.patch
