2021-04-14 14:50:18

by Dan Carpenter

Subject: [PATCH v2] ipw2x00: potential buffer overflow in libipw_wx_set_encodeext()

The "ext->key_len" is a u16 that comes from the user. If it's over
SCM_KEY_LEN (32) that could lead to memory corruption.

Fixes: e0d369d1d969 ("[PATCH] ieee82011: Added WE-18 support to default wireless extension handler")
Signed-off-by: Dan Carpenter <[email protected]>
---
v2: use clamp_val() instead of min_t()

drivers/net/wireless/intel/ipw2x00/libipw_wx.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/intel/ipw2x00/libipw_wx.c b/drivers/net/wireless/intel/ipw2x00/libipw_wx.c
index a0cf78c418ac..903de34028ef 100644
--- a/drivers/net/wireless/intel/ipw2x00/libipw_wx.c
+++ b/drivers/net/wireless/intel/ipw2x00/libipw_wx.c
@@ -633,8 +633,10 @@ int libipw_wx_set_encodeext(struct libipw_device *ieee,
}

if (ext->alg != IW_ENCODE_ALG_NONE) {
- memcpy(sec.keys[idx], ext->key, ext->key_len);
- sec.key_sizes[idx] = ext->key_len;
+ int key_len = clamp_val(ext->key_len, 0, SCM_KEY_LEN);
+
+ memcpy(sec.keys[idx], ext->key, key_len);
+ sec.key_sizes[idx] = key_len;
sec.flags |= (1 << idx);
if (ext->alg == IW_ENCODE_ALG_WEP) {
sec.encode_alg[idx] = SEC_ALG_WEP;
--
2.30.2

2021-04-14 15:28:34

by Stanislav Yakovlev

Subject: Re: [PATCH v2] ipw2x00: potential buffer overflow in libipw_wx_set_encodeext()

On Wed, 14 Apr 2021 at 12:30, Dan Carpenter <[email protected]> wrote:
>
> The "ext->key_len" is a u16 that comes from the user. If it's over
> SCM_KEY_LEN (32) that could lead to memory corruption.
>
> Fixes: e0d369d1d969 ("[PATCH] ieee82011: Added WE-18 support to default wireless extension handler")
> Signed-off-by: Dan Carpenter <[email protected]>
> ---
> v2: use clamp_val() instead of min_t()
>
> drivers/net/wireless/intel/ipw2x00/libipw_wx.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>

Cc: [email protected]
Acked-by: Stanislav Yakovlev <[email protected]>

Stanislav.

2021-04-17 17:36:39

by Kalle Valo

Subject: Re: [v2] ipw2x00: potential buffer overflow in libipw_wx_set_encodeext()

Dan Carpenter <[email protected]> wrote:

> The "ext->key_len" is a u16 that comes from the user. If it's over
> SCM_KEY_LEN (32) that could lead to memory corruption.
>
> Fixes: e0d369d1d969 ("[PATCH] ieee82011: Added WE-18 support to default wireless extension handler")
> Cc: [email protected]
> Signed-off-by: Dan Carpenter <[email protected]>
> Acked-by: Stanislav Yakovlev <[email protected]>

Patch applied to wireless-drivers-next.git, thanks.

260a9ad94467 ipw2x00: potential buffer overflow in libipw_wx_set_encodeext()

--
https://patchwork.kernel.org/project/linux-wireless/patch/YHaoA1i+8uT4ir4h@mwanda/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches