[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1262651630-7354-39-git-send-email-gregkh@suse.de>
Date: Mon, 4 Jan 2010 16:32:52 -0800
From: Greg Kroah-Hartman <gregkh@...e.de>
To: linux-kernel@...r.kernel.org, stable@...nel.org,
stable-review@...nel.org
Cc: torvalds@...ux-foundation.org, akpm@...ux-foundation.org,
alan@...rguk.ukuu.org.uk, Daniel Mack <daniel@...aq.de>,
Stephen Hemminger <shemminger@...tta.com>,
Maithili Hinge <maithili@...vell.com>,
Kiran Divekar <dkiran@...vell.com>,
Michael Hirsch <m.hirsch@...mfeld.com>, netdev@...r.kernel.org,
libertas-dev@...ts.infradead.org,
linux-wireless@...ts.infradead.org,
"John W. Linville" <linville@...driver.com>,
Greg Kroah-Hartman <gregkh@...e.de>
Subject: [PATCH 39/97] Libertas: fix buffer overflow in lbs_get_essid()
From: Daniel Mack <daniel@...aq.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@...aq.de>
Cc: Stephen Hemminger <shemminger@...tta.com>
Cc: Maithili Hinge <maithili@...vell.com>
Cc: Kiran Divekar <dkiran@...vell.com>
Cc: Michael Hirsch <m.hirsch@...mfeld.com>
Cc: netdev@...r.kernel.org
Cc: libertas-dev@...ts.infradead.org
Cc: linux-wireless@...ts.infradead.org
Acked-by: Holger Schurig <holgerschurig@...il.com>
Acked-by: Dan Williams <dcbw@...hat.com>
Signed-off-by: John W. Linville <linville@...driver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@...e.de>
---
drivers/net/wireless/libertas/wext.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/libertas/wext.c b/drivers/net/wireless/libertas/wext.c
index be837a0..01c738b 100644
--- a/drivers/net/wireless/libertas/wext.c
+++ b/drivers/net/wireless/libertas/wext.c
@@ -1953,10 +1953,8 @@ static int lbs_get_essid(struct net_device *dev, struct iw_request_info *info,
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
--
1.6.6
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists