[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git-commits-head
Subject:    staging: ks7010: potential buffer overflow in ks_wlan_set_encode_ext()
From:       Linux Kernel Mailing List <linux-kernel () vger ! kernel ! org>
Date:       2023-07-30 19:43:48
Message-ID: git-mailbomb-linux-master-5f1c7031e044cb2fba82836d55cc235e2ad619dc () kernel ! org
[Download RAW message or body]

Commit:     5f1c7031e044cb2fba82836d55cc235e2ad619dc
Parent:     4912649e1cf0317bf563f91655e04a303cacaf8d
Refname:    refs/heads/master
Web:        https://git.kernel.org/torvalds/c/5f1c7031e044cb2fba82836d55cc235e2ad619dc
Author:     Zhang Shurong <zhang_shurong@foxmail.com>
AuthorDate: Sun Jul 9 13:50:07 2023 +0800
Committer:  Greg Kroah-Hartman <gregkh@linuxfoundation.org>
CommitDate: Thu Jul 27 09:54:33 2023 +0200

    staging: ks7010: potential buffer overflow in ks_wlan_set_encode_ext()
    
    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@kernel.org>
    Signed-off-by: Zhang Shurong <zhang_shurong@foxmail.com>
    Reviewed-by: Dan Carpenter <dan.carpenter@linaro.org>
    Link: https://lore.kernel.org/r/tencent_5153B668C0283CAA15AA518325346E026A09@qq.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/staging/ks7010/ks_wlan_net.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/ks7010/ks_wlan_net.c b/drivers/staging/ks7010/ks_wlan_net.c
index e03c87f0bfe7a..0fb97a79ad0b3 100644
--- a/drivers/staging/ks7010/ks_wlan_net.c
+++ b/drivers/staging/ks7010/ks_wlan_net.c
@@ -1583,8 +1583,10 @@ static int ks_wlan_set_encode_ext(struct net_device *dev,
 			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;
[prev in list] [next in list] [prev in thread] [next in thread]