From patchwork Wed Dec 23 14:33:35 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Berg X-Patchwork-Id: 41669 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 2F493B7BE5 for ; Thu, 24 Dec 2009 01:33:49 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756037AbZLWOdo (ORCPT ); Wed, 23 Dec 2009 09:33:44 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755186AbZLWOdn (ORCPT ); Wed, 23 Dec 2009 09:33:43 -0500 Received: from xc.sipsolutions.net ([83.246.72.84]:58509 "EHLO sipsolutions.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750986AbZLWOdn (ORCPT ); Wed, 23 Dec 2009 09:33:43 -0500 Received: by sipsolutions.net with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1NNSHR-0008L0-1Y; Wed, 23 Dec 2009 15:33:37 +0100 Subject: [PATCH] cfg80211: fix error path in cfg80211_wext_siwscan From: Johannes Berg To: Dan Carpenter Cc: "John W. Linville" , "David S. Miller" , linux-wireless@vger.kernel.org, netdev@vger.kernel.org In-Reply-To: <20091223132937.GG17923@bicker> References: <20091223132937.GG17923@bicker> Date: Wed, 23 Dec 2009 15:33:35 +0100 Message-ID: <1261578815.7304.7.camel@johannes.local> Mime-Version: 1.0 X-Mailer: Evolution 2.29.3.2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org If there's an invalid channel or SSID, the code leaks the scan request. Always free the scan request, unless it was successfully given to the driver. Reported-by: Dan Carpenter Signed-off-by: Johannes Berg Acked-by: Dan Carpenter --- I kinda prefer this, thoughts? net/wireless/scan.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- wireless-testing.orig/net/wireless/scan.c 2009-12-23 15:27:20.000000000 +0100 +++ wireless-testing/net/wireless/scan.c 2009-12-23 15:32:52.000000000 +0100 @@ -601,7 +601,7 @@ int cfg80211_wext_siwscan(struct net_dev struct cfg80211_registered_device *rdev; struct wiphy *wiphy; struct iw_scan_req *wreq = NULL; - struct cfg80211_scan_request *creq; + struct cfg80211_scan_request *creq = NULL; int i, err, n_channels = 0; enum ieee80211_band band; @@ -694,8 +694,10 @@ int cfg80211_wext_siwscan(struct net_dev /* translate "Scan for SSID" request */ if (wreq) { if (wrqu->data.flags & IW_SCAN_THIS_ESSID) { - if (wreq->essid_len > IEEE80211_MAX_SSID_LEN) - return -EINVAL; + if (wreq->essid_len > IEEE80211_MAX_SSID_LEN) { + err = -EINVAL; + goto out; + } memcpy(creq->ssids[0].ssid, wreq->essid, wreq->essid_len); creq->ssids[0].ssid_len = wreq->essid_len; } @@ -707,12 +709,15 @@ int cfg80211_wext_siwscan(struct net_dev err = rdev->ops->scan(wiphy, dev, creq); if (err) { rdev->scan_req = NULL; - kfree(creq); + /* creq will be freed below */ } else { nl80211_send_scan_start(rdev, dev); + /* creq now owned by driver */ + creq = NULL; dev_hold(dev); } out: + kfree(creq); cfg80211_unlock_rdev(rdev); return err; }