Received: by 2002:a25:c205:0:0:0:0:0 with SMTP id s5csp5907990ybf; Thu, 5 Mar 2020 09:16:13 -0800 (PST) X-Google-Smtp-Source: ADFU+vtLKA2N1xo1rEqKC+yx+u+iGhtQNnB/nY5MjmjZsFnOQHq4ZeRrQBhdgN00wfj0lcQnLUU1 X-Received: by 2002:a9d:836:: with SMTP id 51mr7843058oty.318.1583428573052; Thu, 05 Mar 2020 09:16:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583428573; cv=none; d=google.com; s=arc-20160816; b=pHDD2sqTMZWbtsA9ysD0hAGVXvHz5sDpo90M4PBBlgK0Vtan2FZtu30BOdU1zph79R TpfexRZiMfuy6R1m5oWFlZ1KTJG8GvCdco0WscSu+dIcPMasE7ApVvuskdLdx3z/nP+l pMJRkAgDdaCYc1xKqjtWAzawzA0o+7j3ckOmL1P/wQTqVX8u3TPq8VDa6Tz5cY6JyS3/ 0L5fnYQue0o9lFWu0RwmjUEFe6VOhxLC4h0yK6eZReL4Rrsb8DXNwD67ZfewtGbG7yVA d2KQXljVUX6Zh6eubb6KRNbieN4/CSwCyobb3SJZIl+twDLEbAUT+cRZbD7BxQRDW+gd Paaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Xm5KGmBI7GXihpL0lbTeYxSGNnLaWpy3tME0cONxAVQ=; b=hRtF/pnoYY5B6r19KwgcSJT49SCzwO4vpzph6hK4nvMT5sOKAMm+IoT5cLff7s6FQg INSJx/xqxZy94EWh2Iiu6n1QQ/pOlvOWjt21OOml1m9gXLY9BTC0K5xIKlVktu0k7Xou 5Yh+zMYxWECee99ZRx5gan2L7xxL451IQmgNwpZ5Y8oHHFqurahSdbgkQrunniQzx7Lz 1IdN058cR8VHsFm/zqnWn4JhaFSd23ghPCFSGtwoJ30OeTQzY9ztzb0vyn7IpwEcNVKv 5nXkXG1zu5oAIu/dSlGp2Ws/1mDLWHoqnZeoHboUB+XgUHf9TNCBUSQlsJ6PKbmMdHAd eMng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="ctNo/RhS"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m11si3880524otp.174.2020.03.05.09.16.01; Thu, 05 Mar 2020 09:16:13 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="ctNo/RhS"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727968AbgCERPJ (ORCPT + 99 others); Thu, 5 Mar 2020 12:15:09 -0500 Received: from mail.kernel.org ([198.145.29.99]:41130 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727788AbgCEROp (ORCPT ); Thu, 5 Mar 2020 12:14:45 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 648CD2465D; Thu, 5 Mar 2020 17:14:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583428485; bh=fVEhOtjzIRXLblm9Oehoq5s64cEfH6JyaAg+jP4d8oA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ctNo/RhSeb6zpCeyH+TU+zsEMiuMDc/8nT8oQ7wvX2AH6HuEy6zmZ1JEAboiow2el zCSQp7F4iA8npn6SBdjXbxy3HMYqjewBpE0iYgd2NDp1IVJ8og0J8WkyihduXVTXjI D8vf/rjU3rbaFpCn6f5JEUlIDPAixER1T7e1hJak= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Johannes Berg , Sasha Levin , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 20/58] nl80211: fix potential leak in AP start Date: Thu, 5 Mar 2020 12:13:41 -0500 Message-Id: <20200305171420.29595-20-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200305171420.29595-1-sashal@kernel.org> References: <20200305171420.29595-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Johannes Berg [ Upstream commit 9951ebfcdf2b97dbb28a5d930458424341e61aa2 ] If nl80211_parse_he_obss_pd() fails, we leak the previously allocated ACL memory. Free it in this case. Fixes: 796e90f42b7e ("cfg80211: add support for parsing OBBS_PD attributes") Signed-off-by: Johannes Berg Link: https://lore.kernel.org/r/20200221104142.835aba4cdd14.I1923b55ba9989c57e13978f91f40bfdc45e60cbd@changeid Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/wireless/nl80211.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index c74646b7a751f..78c2d9359fc72 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -4794,8 +4794,7 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info) err = nl80211_parse_he_obss_pd( info->attrs[NL80211_ATTR_HE_OBSS_PD], ¶ms.he_obss_pd); - if (err) - return err; + goto out; } nl80211_calculate_ap_params(¶ms); @@ -4817,6 +4816,7 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info) } wdev_unlock(wdev); +out: kfree(params.acl); return err; -- 2.20.1