* [PATCH v2] ipw2x00: potential buffer overflow in libipw_wx_set_encodeext()
@ 2021-04-14 8:29 Dan Carpenter
2021-04-14 11:09 ` Stanislav Yakovlev
2021-04-17 17:36 ` [v2] " Kalle Valo
0 siblings, 2 replies; 3+ messages in thread
From: Dan Carpenter @ 2021-04-14 8:29 UTC (permalink / raw)
To: Stanislav Yakovlev
Cc: Kalle Valo, James Ketrenos, Jeff Garzik, linux-wireless, kernel-janitors
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 <dan.carpenter@oracle.com>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] ipw2x00: potential buffer overflow in libipw_wx_set_encodeext()
2021-04-14 8:29 [PATCH v2] ipw2x00: potential buffer overflow in libipw_wx_set_encodeext() Dan Carpenter
@ 2021-04-14 11:09 ` Stanislav Yakovlev
2021-04-17 17:36 ` [v2] " Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Stanislav Yakovlev @ 2021-04-14 11:09 UTC (permalink / raw)
To: Dan Carpenter
Cc: Kalle Valo, James Ketrenos, Jeff Garzik, wireless, kernel-janitors
On Wed, 14 Apr 2021 at 12:30, Dan Carpenter <dan.carpenter@oracle.com> 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 <dan.carpenter@oracle.com>
> ---
> 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: stable@vger.kernel.org
Acked-by: Stanislav Yakovlev <stas.yakovlev@gmail.com>
Stanislav.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [v2] ipw2x00: potential buffer overflow in libipw_wx_set_encodeext()
2021-04-14 8:29 [PATCH v2] ipw2x00: potential buffer overflow in libipw_wx_set_encodeext() Dan Carpenter
2021-04-14 11:09 ` Stanislav Yakovlev
@ 2021-04-17 17:36 ` Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Kalle Valo @ 2021-04-17 17:36 UTC (permalink / raw)
To: Dan Carpenter
Cc: Stanislav Yakovlev, James Ketrenos, Jeff Garzik, linux-wireless,
kernel-janitors
Dan Carpenter <dan.carpenter@oracle.com> 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: stable@vger.kernel.org
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> Acked-by: Stanislav Yakovlev <stas.yakovlev@gmail.com>
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-04-17 17:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-14 8:29 [PATCH v2] ipw2x00: potential buffer overflow in libipw_wx_set_encodeext() Dan Carpenter
2021-04-14 11:09 ` Stanislav Yakovlev
2021-04-17 17:36 ` [v2] " 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.