Received: by 2002:a05:6a10:eb17:0:0:0:0 with SMTP id hx23csp491007pxb; Thu, 9 Sep 2021 05:46:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzRSnQmzEAltmIiTdrdDdetB84Lux5g7x2vSc0d1zc1Xay8dUKBLA5n8PeRlGhv/fNOVGhG X-Received: by 2002:a6b:fd1a:: with SMTP id c26mr2446098ioi.57.1631191583702; Thu, 09 Sep 2021 05:46:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631191583; cv=none; d=google.com; s=arc-20160816; b=k9+j98/G4tKOMEPE3apNO4F8bJkfgDXTPdrbrEA1Eb9kux8LuPMuhpMIgsmmLnpgN4 f/oT31dkW8jqp3zdQURbEgcBo8CVlPU6tA5DZscs/VWaA4Yu4KwzXgJEtMiBSto39h5W CAmyF5peP4a6SOMbYZtutXpKF1SU/kioTdo/FjhTVm8y+S0K2oUgumWGYjAzJ7Xh3BKf Rkr2694XIuunOxVGusDwbfkymjq+3xGfEKnAzm70ajuK+sBcoHCdlmfN8dH9zjg93hWh hsJVSEwcS/P5MzZBA0WJmkvlmoyOFotCssVMaSn+uCipL5Of7eD5a7khDzo3hrCWolMN BM5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=wzKSGKvZUBGVyGuGy3Bg5EgNX3s8By68y/xpnlnVBSA=; b=CSy/+h/HVHmAWPT8KUxYodBoFRt+vNV+corbnXHJvhewSalqsex1BMWzvySYMebZ46 SgJJVaCTZ5S/mF4fXyo4Pp0fCjBG/pzn+yU0ophkJO4Meog+0cWQWGyFTPL1kphgHFeg K2W8JfBIis0GByRSQA/bFrSrwt0JrDM6gEmFTymc3fmJ3QhGa19NcAzE8mlX+06bLrkF Iimi+vFOwarCzCESvB4Oud1SMoSkvgQ5HxTbgWwWF52b53ZiDRHbonztCvcEwOYwBjPh AM0ClJjXhOq94d8k9wUdRWQvrcPOYCh6HZGaGNwWqr6qR41TEheogUAt83KzGgsSls04 ZRlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="pUL/qgqb"; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-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. [23.128.96.18]) by mx.google.com with ESMTP id t42si1946052jal.13.2021.09.09.05.46.11; Thu, 09 Sep 2021 05:46:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="pUL/qgqb"; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-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 S1346171AbhIIMnT (ORCPT + 99 others); Thu, 9 Sep 2021 08:43:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:46120 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354808AbhIIMji (ORCPT ); Thu, 9 Sep 2021 08:39:38 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id DF41761BC1; Thu, 9 Sep 2021 11:54:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631188486; bh=0aY4F8c7rGggn5HI5TC8GIay4v5BXEnug4TyLeOZK6I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pUL/qgqb63gww/tIyT51tlZXVb96pewIMJLGqAI77Ow1FS5sYsm3lx/SPxRH2S4qt 92j+lMI0miOLW0r975N4a1DAt2XMXMJMrgf3I2gqoG+eYjavViMc/cdCpfqbq9eQUX hT2FCzGWQB2cprxH9B7ghx4rzwYkmSrrrO6YdhVAhiCvpe6jnkwy5NgbFVbunBmTRK Fx6AAHxIKG6mnXaQ6cpC6kjzkpYFQMeYOUdDuTKXiDLbL6vQ9yQMQGNif+cUZ2X+sm b/2OVQQBK+4kiee9j/3EKMJYP8OF8jt3F0lc1QzEcW8lZIvWOSqJjCUEUzSUwpATw0 2IpxZVPULYxWA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zhang Qilong , Luca Coelho , Sasha Levin , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 161/176] iwlwifi: mvm: fix a memory leak in iwl_mvm_mac_ctxt_beacon_changed Date: Thu, 9 Sep 2021 07:51:03 -0400 Message-Id: <20210909115118.146181-161-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210909115118.146181-1-sashal@kernel.org> References: <20210909115118.146181-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Zhang Qilong [ Upstream commit 0f5d44ac6e55551798dd3da0ff847c8df5990822 ] If beacon_inject_active is true, we will return without freeing beacon. Fid that by freeing it before returning. Signed-off-by: Zhang Qilong [reworded the commit message] Signed-off-by: Luca Coelho Link: https://lore.kernel.org/r/iwlwifi.20210802172232.d16206ca60fc.I9984a9b442c84814c307cee3213044e24d26f38a@changeid Signed-off-by: Luca Coelho Signed-off-by: Sasha Levin --- drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c index cbdebefb854a..6f5951aed8a7 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c @@ -1044,8 +1044,10 @@ int iwl_mvm_mac_ctxt_beacon_changed(struct iwl_mvm *mvm, return -ENOMEM; #ifdef CONFIG_IWLWIFI_DEBUGFS - if (mvm->beacon_inject_active) + if (mvm->beacon_inject_active) { + dev_kfree_skb(beacon); return -EBUSY; + } #endif ret = iwl_mvm_mac_ctxt_send_beacon(mvm, vif, beacon); -- 2.30.2