netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] wireless: wext: allocate space for NULL-termination for 32byte SSIDs
@ 2009-12-12 20:47 Daniel Mack
  2009-12-15  9:43 ` David Miller
                   ` (2 more replies)
  0 siblings, 3 replies; 17+ messages in thread
From: Daniel Mack @ 2009-12-12 20:47 UTC (permalink / raw)
  To: linux-kernel
  Cc: Daniel Mack, Dan Williams, Michael Hirsch, netdev, libertas-dev,
	stable

We've experienced a long standing bug when quickly switching from
ad-hoc to managed mode on a hardware using a Libertas chipset.

The effect is that after a number of mode transistions (sometimes as few
as two sufficed), the kernel will oops at very strange locations, mostly
in something like __kmem_alloc().

While the root cause turned out to be an issue with the wpa-supplicant
which feeds the kernel driver with garbage, this occasion pointed out a
bug in the wireless wext core when SSIDs with 32 byte lengths are passed
from userspace. In this case, the string is not properly NULL-terminated
which causes some other part to corrupt memory.

(In the particular case I observed, an SIOCSIWESSID was issued with
 bogus data in iwp->pointer but iwp->length=32).

I admitedly couldn't find where the actual corruption itself happens,
but with this trivial fix, I can't reproduce the bug anymore.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Cc: Dan Williams <dcbw@redhat.com>
Cc: Michael Hirsch <m.hirsch@raumfeld.com>
Cc: netdev@vger.kernel.org
Cc: libertas-dev@lists.infradead.org
Cc: stable@kernel.org
---
 net/wireless/wext.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
 net/wireless/wext-core.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/wireless/wext-core.c b/net/wireless/wext-core.c
index 5e1656b..3d8f4b0 100644
--- a/net/wireless/wext-core.c
+++ b/net/wireless/wext-core.c
@@ -759,8 +759,8 @@ static int ioctl_standard_iw_point(struct iw_point *iwp, unsigned int cmd,
 		}
 	}
 
-	/* kzalloc() ensures NULL-termination for essid_compat. */
-	extra = kzalloc(extra_size, GFP_KERNEL);
+	/* kzalloc() +1 ensures NULL-termination for essid_compat. */
+	extra = kzalloc(extra_size + 1, GFP_KERNEL);
 	if (!extra)
 		return -ENOMEM;
 
-- 
1.6.3.3


^ permalink raw reply related	[flat|nested] 17+ messages in thread

end of thread, other threads:[~2009-12-16  8:27 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-12-12 20:47 [PATCH] wireless: wext: allocate space for NULL-termination for 32byte SSIDs Daniel Mack
2009-12-15  9:43 ` David Miller
2009-12-15 10:03   ` Johannes Berg
2009-12-15 10:05     ` Johannes Berg
2009-12-15 10:07     ` Johannes Berg
     [not found]       ` <1260871634.3692.6.camel-YfaajirXv2244ywRPIzf9A@public.gmane.org>
2009-12-15 10:20         ` Daniel Mack
     [not found]           ` <20091215102035.GJ28375-ahpEBR4enfnCULTFXS99ULNAH6kLmebB@public.gmane.org>
2009-12-15 10:31             ` Johannes Berg
2009-12-15 10:37               ` Daniel Mack
2009-12-15 10:30         ` Holger Schurig
     [not found]           ` <200912151130.59103.holgerschurig-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2009-12-15 10:35             ` Johannes Berg
2009-12-16  6:54               ` Albert Cahalan
2009-12-16  8:19                 ` Johannes Berg
2009-12-16  8:26                 ` Holger Schurig
2009-12-16  3:58     ` Daniel Mack
2009-12-16  8:20       ` Johannes Berg
2009-12-15 10:16 ` Albert Cahalan
2009-12-15 16:29 ` Marcel Holtmann

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).