From patchwork Tue Mar 3 17:43:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 229930 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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 6C16EC3F2C6 for ; Tue, 3 Mar 2020 18:06:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3B06620CC7 for ; Tue, 3 Mar 2020 18:06:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583258804; bh=Vu/gLe8H56HTwlLVNxZAMJGHzRJSkOYWMG21ZUvVoEw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=abE4Mf+pOyWSbtGeTT8dCDUHgKXFV48AYOrqe29ys7wFnAlP6oPVMJAeLHA9W0K8A h1bWMVOLba8mTNtwmYFUqF4C7te4TCLjyI0o1mzM3PU6o5kx+d4WVmA01JOkCVJbf8 pUBmZKtKtNACCYdERF8kXqrwR7pyjj6f9RvjY95s= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732853AbgCCR4M (ORCPT ); Tue, 3 Mar 2020 12:56:12 -0500 Received: from mail.kernel.org ([198.145.29.99]:38242 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732851AbgCCR4M (ORCPT ); Tue, 3 Mar 2020 12:56:12 -0500 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 5E94B20728; Tue, 3 Mar 2020 17:56:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583258171; bh=Vu/gLe8H56HTwlLVNxZAMJGHzRJSkOYWMG21ZUvVoEw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nFC5mZoFdWQV9lJCGnuOuz28rFLPPxcMdkTgQCfYR00pbVf+ovoGwIcE0sWFGMyTj L1j4YNWGo7Azu2HFr1GQ0a3QlwSNPh5z/t/HXYMKvoAiRkJIQvTkzsdqPibQsvRrAS wDxdPVPPd+jOgduVAXsu+U1t32JA7sB72o/WtY2o= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johannes Berg Subject: [PATCH 5.4 099/152] nl80211: fix potential leak in AP start Date: Tue, 3 Mar 2020 18:43:17 +0100 Message-Id: <20200303174313.848383566@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200303174302.523080016@linuxfoundation.org> References: <20200303174302.523080016@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Johannes Berg commit 9951ebfcdf2b97dbb28a5d930458424341e61aa2 upstream. 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: Greg Kroah-Hartman --- net/wireless/nl80211.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -4795,8 +4795,7 @@ static int nl80211_start_ap(struct sk_bu 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); @@ -4818,6 +4817,7 @@ static int nl80211_start_ap(struct sk_bu } wdev_unlock(wdev); +out: kfree(params.acl); return err;