Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759827AbZLPENf (ORCPT ); Tue, 15 Dec 2009 23:13:35 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755707AbZLPENe (ORCPT ); Tue, 15 Dec 2009 23:13:34 -0500 Received: from buzzloop.caiaq.de ([212.112.241.133]:60166 "EHLO buzzloop.caiaq.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752272AbZLPENd (ORCPT ); Tue, 15 Dec 2009 23:13:33 -0500 From: Daniel Mack To: linux-kernel@vger.kernel.org Cc: Daniel Mack , Dan Williams , Holger Schurig , "John W. Linville" , Stephen Hemminger , Maithili Hinge , Kiran Divekar , Michael Hirsch , netdev@vger.kernel.org, libertas-dev@lists.infradead.org, linux-wireless@lists.infradead.org, stable@kernel.org Subject: [PATCH] Libertas: fix buffer overflow in lbs_get_essid() Date: Wed, 16 Dec 2009 05:12:58 +0100 Message-Id: <1260936778-2096-1-git-send-email-daniel@caiaq.de> X-Mailer: git-send-email 1.6.5.2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1864 Lines: 50 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: Dan Williams Cc: Holger Schurig Cc: John W. Linville 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 Cc: stable@kernel.org --- 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.3.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/