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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 EC967C3F2D1 for ; Thu, 5 Mar 2020 17:14:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AFD112465D for ; Thu, 5 Mar 2020 17:14:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583428488; bh=fVEhOtjzIRXLblm9Oehoq5s64cEfH6JyaAg+jP4d8oA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ISV/TmRG2oUbL5I0r5XB9i/UkuzM+Y+zznYAbNVipqswN0EuEstbTfGCGwNnkQfJ1 bAR0oQCkWSITZG8rDgnLwpELY9ciVzXPaFeIcCZGoiiRAMFjvRiA5DbSkDuBVlHa2F njxN7S3EyCgVOlE59feXKyBeLiIttG41eXrcyTeE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727803AbgCEROr (ORCPT ); Thu, 5 Mar 2020 12:14:47 -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-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@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