From patchwork Mon Jan 20 14:21:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 3512981 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5CCE9C02DC for ; Mon, 20 Jan 2014 14:25:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 25C3920161 for ; Mon, 20 Jan 2014 14:25:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8572E20173 for ; Mon, 20 Jan 2014 14:25:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752466AbaATOZl (ORCPT ); Mon, 20 Jan 2014 09:25:41 -0500 Received: from mail-ee0-f44.google.com ([74.125.83.44]:37730 "EHLO mail-ee0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751976AbaATOZj (ORCPT ); Mon, 20 Jan 2014 09:25:39 -0500 Received: by mail-ee0-f44.google.com with SMTP id c13so3454395eek.31 for ; Mon, 20 Jan 2014 06:25:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZQCTsshgAad4EKNsr5zZRwwNrGRRIa2ZbPOOOO6k7Gc=; b=VkbsxohxDqg0z5awT3Yj+o8CsYNPXYqeehGjxGWwiDJ6ENHkYY3Jbo/UzA6t6MLlnH sX/rduwRKFe+jP7pV9SGyoZx3QDlQFyNVsExdSOXKrpJtpkBabxt9OKpQu94dTS0VGDP 3neTr1/kqwM57T+1Z4CKPQ94gydx/g4Ofef9o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ZQCTsshgAad4EKNsr5zZRwwNrGRRIa2ZbPOOOO6k7Gc=; b=iDJR6yrEDpzFnsTu24Z8ohMHwElsDXAdSbh5KtjBalcHsEgjCAg4YF+kXAtpCopVOu bsxSchpf7xknSPqNlOeGgaSKu3nn7NGdDvbQDjrT9ch+0UC6uRBXKZbl+NMB7VcJWERW 85oaFBUXfXuMf53l7hwTyKYg6h2jdTDTS2W44UUbmA6ifKwiBTXsVHkwPwv2oPKwBAQ2 NWfmLZLa0MOifuNDzr994XNdJJZDkngADe7XvzTtnYyvYqKELfdfJndOGpqVr5LuomTW YK5GQ1+uPbUh48jv+nNMpkIGVW+D9iW2RG3Zvcuv5ibwL/8I8RMe8LC/dSs6sXampSRv /QiQ== X-Gm-Message-State: ALoCoQmPU3JthM6WVOpfMip0sDK5mKPjig/bldNtSkKNC24IM733Tfh2goQrR+WnrJ6/N75TgfrNVrXqTKxByzeEQziNnypDzgukcYhzm/dhWUNeEEFKhdc= X-Received: by 10.14.148.138 with SMTP id v10mr18261437eej.37.1390227938708; Mon, 20 Jan 2014 06:25:38 -0800 (PST) Received: from localhost.localdomain ([91.198.246.8]) by mx.google.com with ESMTPSA id 46sm3702597ees.4.2014.01.20.06.25.37 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Jan 2014 06:25:38 -0800 (PST) From: Michal Kazior To: linux-wireless@vger.kernel.org Cc: johannes@sipsolutions.net, Michal Kazior Subject: [PATCH 1/7] mac80211: fix possible memory leak on AP CSA failure Date: Mon, 20 Jan 2014 15:21:04 +0100 Message-Id: <1390227670-19030-2-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 1.8.4.rc3 In-Reply-To: <1390227670-19030-1-git-send-email-michal.kazior@tieto.com> References: <1390227670-19030-1-git-send-email-michal.kazior@tieto.com> X-DomainID: tieto.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If CSA for AP interface failed and the interface was not stopped afterwards another CSA request would leak sdata->u.ap.next_beacon. Signed-off-by: Michal Kazior --- net/mac80211/cfg.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 65dac7f..62bf6c4 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -2988,6 +2988,21 @@ cfg80211_beacon_dup(struct cfg80211_beacon_data *beacon) return new_beacon; } +static int ieee80211_ap_finish_csa(struct ieee80211_sub_if_data *sdata) +{ + int err; + + err = ieee80211_assign_beacon(sdata, sdata->u.ap.next_beacon); + kfree(sdata->u.ap.next_beacon); + sdata->u.ap.next_beacon = NULL; + + if (err < 0) + return err; + + ieee80211_bss_info_change_notify(sdata, err); + return 0; +} + void ieee80211_csa_finish(struct ieee80211_vif *vif) { struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif); @@ -3019,15 +3034,9 @@ static void ieee80211_csa_finalize(struct ieee80211_sub_if_data *sdata) sdata->vif.csa_active = false; switch (sdata->vif.type) { case NL80211_IFTYPE_AP: - err = ieee80211_assign_beacon(sdata, sdata->u.ap.next_beacon); + err = ieee80211_ap_finish_csa(sdata); if (err < 0) return; - - changed |= err; - kfree(sdata->u.ap.next_beacon); - sdata->u.ap.next_beacon = NULL; - - ieee80211_bss_info_change_notify(sdata, err); break; case NL80211_IFTYPE_ADHOC: ieee80211_ibss_finish_csa(sdata);