From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9656AC433FF for ; Wed, 14 Aug 2019 17:26:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6D197214DA for ; Wed, 14 Aug 2019 17:26:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565803573; bh=X2Xp1Ub7iOB42ET/E+acLVe+OBzEfYU8mumcHqqqrwM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=QDA2uxKCIINZ6mfOC4oS6v5R4k1YN20z9R04F+0tizJrVZP3eCpLOwnQRVcWS/k2B laLW2BXmsQQNH4GE8+e08v6jTpIjLt/O6MJvOSiE5Ck38aKzlbUTvDG7RUrcEedurf ZoxIPzW/QyFQn/5mKXRiVkpD2jNIGLkIazJ4ukL4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726551AbfHNR0H (ORCPT ); Wed, 14 Aug 2019 13:26:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:54108 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728576AbfHNRFN (ORCPT ); Wed, 14 Aug 2019 13:05:13 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BB628208C2; Wed, 14 Aug 2019 17:05:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565802312; bh=X2Xp1Ub7iOB42ET/E+acLVe+OBzEfYU8mumcHqqqrwM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U3Z1LHF+rrcmwP5slC8bMbJNILEBoXEIIdU9HWN17tAGBXE5EUVtWclYtlZCHAW9j VA5J+SMzV1XQ9covLpgxXq9VZKu7JagICLPvKEWULdLLzi5hDpfWeMo7Nvpbe8v2YM yjhdqR5oZFDrZhfyF3Jl/GIVQQlQTF4Q64+c73S0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lorenzo Bianconi , Johannes Berg , Sasha Levin Subject: [PATCH 5.2 076/144] mac80211: fix possible memory leak in ieee80211_assign_beacon Date: Wed, 14 Aug 2019 19:00:32 +0200 Message-Id: <20190814165803.034950064@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190814165759.466811854@linuxfoundation.org> References: <20190814165759.466811854@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit bcc27fab8cc673ddc95452674373cce618ccb3a3 ] Free new beacon_data in ieee80211_assign_beacon whenever ieee80211_assign_beacon fails Fixes: 8860020e0be1 ("cfg80211: restructure AP/GO mode API") Fixes: bc847970f432 ("mac80211: support FTM responder configuration/statistic") Signed-off-by: Lorenzo Bianconi Link: https://lore.kernel.org/r/770285772543c9fca33777bb4ad4760239e56256.1562105631.git.lorenzo@kernel.org Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/mac80211/cfg.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index a1973a26c7fc4..b8288125e05db 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -935,8 +935,10 @@ static int ieee80211_assign_beacon(struct ieee80211_sub_if_data *sdata, err = ieee80211_set_probe_resp(sdata, params->probe_resp, params->probe_resp_len, csa); - if (err < 0) + if (err < 0) { + kfree(new); return err; + } if (err == 0) changed |= BSS_CHANGED_AP_PROBE_RESP; @@ -948,8 +950,10 @@ static int ieee80211_assign_beacon(struct ieee80211_sub_if_data *sdata, params->civicloc, params->civicloc_len); - if (err < 0) + if (err < 0) { + kfree(new); return err; + } changed |= BSS_CHANGED_FTM_RESPONDER; } -- 2.20.1