* [patch] staging: rtl8712: memory corruption in wpa_set_encryption()
@ 2016-01-30 14:41 Dan Carpenter
2016-01-31 0:37 ` Joshua Clayton
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2016-01-30 14:41 UTC (permalink / raw)
To: Larry Finger
Cc: Florian Schilhabel, Greg Kroah-Hartman, Luis de Bethencourt,
Joshua Clayton, Punit Vara, Andy Shevchenko, Aya Mahfouz,
Alison Schofield, devel, linux-kernel, kernel-janitors
->KeyMaterial is declared as a 16 byte array, but we only ever allocate
either 5 or 13 bytes of it. The problem is that we memset() all 16
bytes to zero so we're memsetting past the end of the allocated memory.
I fixed this in slightly lazy way, by just allocating 16 bytes. This
works but there is a lot more cleanup you could do to this code if you
wanted. Which is why this code is in staging.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index edfc680..db2e31bc 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -398,12 +398,9 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param,
wep_key_idx = 0;
if (wep_key_len > 0) {
wep_key_len = wep_key_len <= 5 ? 5 : 13;
- pwep = kmalloc((u32)(wep_key_len +
- FIELD_OFFSET(struct NDIS_802_11_WEP,
- KeyMaterial)), GFP_ATOMIC);
+ pwep = kzalloc(sizeof(*pwep), GFP_ATOMIC);
if (pwep == NULL)
return -ENOMEM;
- memset(pwep, 0, sizeof(struct NDIS_802_11_WEP));
pwep->KeyLength = wep_key_len;
pwep->Length = wep_key_len +
FIELD_OFFSET(struct NDIS_802_11_WEP,
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [patch] staging: rtl8712: memory corruption in wpa_set_encryption()
2016-01-30 14:41 [patch] staging: rtl8712: memory corruption in wpa_set_encryption() Dan Carpenter
@ 2016-01-31 0:37 ` Joshua Clayton
0 siblings, 0 replies; 2+ messages in thread
From: Joshua Clayton @ 2016-01-31 0:37 UTC (permalink / raw)
To: Dan Carpenter
Cc: Larry Finger, Florian Schilhabel, Greg Kroah-Hartman,
Luis de Bethencourt, Punit Vara, Andy Shevchenko, Aya Mahfouz,
Alison Schofield, devel, linux-kernel, kernel-janitors
On Saturday, January 30, 2016 05:41:10 PM Dan Carpenter wrote:
> ->KeyMaterial is declared as a 16 byte array, but we only ever allocate
> either 5 or 13 bytes of it. The problem is that we memset() all 16
> bytes to zero so we're memsetting past the end of the allocated memory.
>
> I fixed this in slightly lazy way, by just allocating 16 bytes. This
> works but there is a lot more cleanup you could do to this code if you
> wanted. Which is why this code is in staging.
Better in every way than a crazy variable alloc if you ask me.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
> index edfc680..db2e31bc 100644
> --- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
> +++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
> @@ -398,12 +398,9 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param,
> wep_key_idx = 0;
> if (wep_key_len > 0) {
> wep_key_len = wep_key_len <= 5 ? 5 : 13;
> - pwep = kmalloc((u32)(wep_key_len +
> - FIELD_OFFSET(struct NDIS_802_11_WEP,
> - KeyMaterial)), GFP_ATOMIC);
> + pwep = kzalloc(sizeof(*pwep), GFP_ATOMIC);
> if (pwep == NULL)
> return -ENOMEM;
> - memset(pwep, 0, sizeof(struct NDIS_802_11_WEP));
Should there be a newline after the "if" statement?
> pwep->KeyLength = wep_key_len;
> pwep->Length = wep_key_len +
> FIELD_OFFSET(struct NDIS_802_11_WEP,
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-01-31 0:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-01-30 14:41 [patch] staging: rtl8712: memory corruption in wpa_set_encryption() Dan Carpenter
2016-01-31 0:37 ` Joshua Clayton
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).