Commit 45b24168 authored by Daniel Mack's avatar Daniel Mack Committed by John W. Linville

Libertas: fix buffer overflow in lbs_get_essid()

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: default avatarDaniel Mack <daniel@caiaq.de>
Cc: Stephen Hemminger <shemminger@vyatta.com>
Cc: Maithili Hinge <maithili@marvell.com>
Cc: Kiran Divekar <dkiran@marvell.com>
Cc: Michael Hirsch <m.hirsch@raumfeld.com>
Cc: netdev@vger.kernel.org
Cc: libertas-dev@lists.infradead.org
Cc: linux-wireless@lists.infradead.org
Cc: stable@kernel.org
Acked-by: default avatarHolger Schurig <holgerschurig@gmail.com>
Acked-by: default avatarDan Williams <dcbw@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 77ca7d9e
...@@ -2025,10 +2025,8 @@ static int lbs_get_essid(struct net_device *dev, struct iw_request_info *info, ...@@ -2025,10 +2025,8 @@ static int lbs_get_essid(struct net_device *dev, struct iw_request_info *info,
if (priv->connect_status == LBS_CONNECTED) { if (priv->connect_status == LBS_CONNECTED) {
memcpy(extra, priv->curbssparams.ssid, memcpy(extra, priv->curbssparams.ssid,
priv->curbssparams.ssid_len); priv->curbssparams.ssid_len);
extra[priv->curbssparams.ssid_len] = '\0';
} else { } else {
memset(extra, 0, 32); memset(extra, 0, 32);
extra[priv->curbssparams.ssid_len] = '\0';
} }
/* /*
* If none, we may want to get the one that was set * If none, we may want to get the one that was set
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment