From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg KH Subject: [08/39] Libertas: fix buffer overflow in lbs_get_essid() Date: Tue, 05 Jan 2010 12:02:04 -0800 Message-ID: <20100105200259.993485759@mini.kroah.org> References: <20100105195007.GA23952@kroah.com> Cc: Daniel Mack , Stephen Hemminger , Maithili Hinge , Kiran Divekar , Michael Hirsch , netdev@vger.kernel.org, libertas-dev@lists.infradead.org, linux-wireless@lists.infradead.org, Holger Schurig , Dan Williams , "John W. Linville" To: linux-kernel@vger.kernel.org, stable@kernel.org, akpm@linux-foundation.org, torvalds@linux-foundation.org, stable-review@kernel.org Return-path: Received: from kroah.org ([198.145.64.141]:49954 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755429Ab0AEUGJ (ORCPT ); Tue, 5 Jan 2010 15:06:09 -0500 In-Reply-To: <20100105195007.GA23952@kroah.com> Sender: netdev-owner@vger.kernel.org List-ID: 2.6.31-stable review patch. If anyone has any objections, please let us know. ------------------ From: Daniel Mack 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 Cc: Stephen Hemminger Cc: Maithili Hinge Cc: Kiran Divekar Cc: Michael Hirsch Cc: netdev@vger.kernel.org Cc: libertas-dev@lists.infradead.org Cc: linux-wireless@lists.infradead.org Acked-by: Holger Schurig Acked-by: Dan Williams Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman --- 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 @@ -1951,10 +1951,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