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,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 74141C2D0CE for ; Sun, 29 Dec 2019 18:09:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4F5B920748 for ; Sun, 29 Dec 2019 18:09:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577642980; bh=eHJppdsqZbfyeBNq6pfRj/q8VLcN4365pRnJlw03DjU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=eYZDmkxU3sT/z8y48umAhf5s+lyP4vl3U2wnnHSJKdwxqF/7Y1rkYGihnse5jTWoo E5qLXUdS8z1QQV4zoXuO0GyNIi1CkPUEA7XpeWzjJp8hI+irKYwF/5uIBv/QiFwajE 73NnPVhmBhALq9TcR3LGJIwPw9O21UUufQJ9cYXk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730943AbfL2Rpl (ORCPT ); Sun, 29 Dec 2019 12:45:41 -0500 Received: from mail.kernel.org ([198.145.29.99]:54934 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730941AbfL2Rpk (ORCPT ); Sun, 29 Dec 2019 12:45:40 -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 D1AD3206A4; Sun, 29 Dec 2019 17:45:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577641540; bh=eHJppdsqZbfyeBNq6pfRj/q8VLcN4365pRnJlw03DjU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LHf8QhW3MpBYze3jpaJZQxsG8j4EESRdzXLyBwlYUDNHTYmFQorbjRceo+CFRQ0Ku kQWQl+snk3UTBqAlFRfkDKx/5WxzfZKGbqsJ1ePoBfpvL5kN5rPZEHqyJUR1MQTiNQ ZSbOirK7JuVB+jpW6cOSjYZ/s6pccW5zEc0rbgZs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wenwen Wang , Kalle Valo , Sasha Levin Subject: [PATCH 5.4 059/434] ath10k: add cleanup in ath10k_sta_state() Date: Sun, 29 Dec 2019 18:21:52 +0100 Message-Id: <20191229172705.757641119@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191229172702.393141737@linuxfoundation.org> References: <20191229172702.393141737@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 From: Wenwen Wang [ Upstream commit 334f5b61a6f29834e881923b98d1e27e5ce9620d ] If 'sta->tdls' is false, no cleanup is executed, leading to memory/resource leaks, e.g., 'arsta->tx_stats'. To fix this issue, perform cleanup before go to the 'exit' label. Signed-off-by: Wenwen Wang Signed-off-by: Kalle Valo Signed-off-by: Sasha Levin --- drivers/net/wireless/ath/ath10k/mac.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index a6d21856b7e7..40889b79fc70 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -6549,8 +6549,12 @@ static int ath10k_sta_state(struct ieee80211_hw *hw, spin_unlock_bh(&ar->data_lock); - if (!sta->tdls) + if (!sta->tdls) { + ath10k_peer_delete(ar, arvif->vdev_id, sta->addr); + ath10k_mac_dec_num_stations(arvif, sta); + kfree(arsta->tx_stats); goto exit; + } ret = ath10k_wmi_update_fw_tdls_state(ar, arvif->vdev_id, WMI_TDLS_ENABLE_ACTIVE); -- 2.20.1