[01/10] Libertas: fix buffer overflow in lbs_get_essid()

Greg KH gregkh at suse.de
Tue Jan 5 14:47:52 EST 2010


2.6.27-stable review patch.  If anyone has any objections, please let us know.

------------------

From: Daniel Mack <daniel at caiaq.de>

commit 45b241689179a6065384260242637cf21dabfb2d upstream.

The libertas driver copies the SSID buffer back to the wireless core and
appends a trailing NULL character for termination. This is

a) unnecessary because the buffer is allocated with kzalloc and is hence
   already NULLed when this function is called, and

b) for priv->curbssparams.ssid_len == 32, it writes back one byte too
   much which causes memory corruptions.

Fix this by removing the extra write.

Signed-off-by: Daniel Mack <daniel at caiaq.de>
Cc: Stephen Hemminger <shemminger at vyatta.com>
Cc: Maithili Hinge <maithili at marvell.com>
Cc: Kiran Divekar <dkiran at marvell.com>
Cc: Michael Hirsch <m.hirsch at raumfeld.com>
Cc: netdev at vger.kernel.org
Cc: libertas-dev at lists.infradead.org
Cc: linux-wireless at lists.infradead.org
Acked-by: Holger Schurig <holgerschurig at gmail.com>
Acked-by: Dan Williams <dcbw at redhat.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

---
 drivers/net/wireless/libertas/wext.c |    2 --
 1 file changed, 2 deletions(-)

--- a/drivers/net/wireless/libertas/wext.c
+++ b/drivers/net/wireless/libertas/wext.c
@@ -1899,10 +1899,8 @@ static int lbs_get_essid(struct net_devi
 	if (priv->connect_status == LBS_CONNECTED) {
 		memcpy(extra, priv->curbssparams.ssid,
 		       priv->curbssparams.ssid_len);
-		extra[priv->curbssparams.ssid_len] = '\0';
 	} else {
 		memset(extra, 0, 32);
-		extra[priv->curbssparams.ssid_len] = '\0';
 	}
 	/*
 	 * If none, we may want to get the one that was set





More information about the libertas-dev mailing list