Received: by 2002:ac0:946b:0:0:0:0:0 with SMTP id j40csp2662803imj; Mon, 11 Feb 2019 06:39:48 -0800 (PST) X-Google-Smtp-Source: AHgI3IaiDPy+rhmv7o7edLrXDJhdOQPirKCY85LTb45RIrQAo72a1y/2bz629yUxpeznBNSXzIZK X-Received: by 2002:aa7:8249:: with SMTP id e9mr23773677pfn.93.1549895988053; Mon, 11 Feb 2019 06:39:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549895988; cv=none; d=google.com; s=arc-20160816; b=bhOXreHm1dtfA1A4uEgP6+VxDSmJhDGQLIvPN0pzsGcegvmvlxQdfY0/GIQz1YxZMY Cgzr0a6gy2a3iMahAe5F5XwTunSdPlYbjmy/hsqw7xz3PMPjsIEwtANVLUoge6NsTK0G RcphTXrgxv0SsrZyt+flyLgWy04U92hXL9NqAEWC3/kKfs/Dp54UqmYpROVEcmK6TW7r 0Zz3OAcZn3wEZiCuifiRFUmFfMjeraLQN9b1FsYy0eCIoCDVlu5MJwl4aFoEt2agiN1L we2LFMv/8r03y5yASG8UXIa1B6LddmCdm208vQpQkfgFntqsClUBQoVT1l827rjQbxdm gxgg== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=330VqH/yuw/9SOZvUFVhA35fTNrlTpsjd1RvxqSEDik=; b=D+BznX1DKUxJL2kXKdUDYnE4OiXSm/BC5imaRlo05drwoNf3tp5XZU/Yl/VcK9Gmfv 4Iqf0tIUwJSES3TXEcOIs8pc6ZpwCXbCSmEVIkjTMxoNPaIOpgv2RSWbkRdSnkMc5soC wq+yNpqrRfoJaTwdvXoqFEpoKZhkEbZRO+vrAktLqUqSn6ASJR1/bSMXryR2bQfhf0K1 Zd3ENxGNnFnLDxd20Hfdv3SARdOc/KiHFUGJ5lQLnx5CuJ1A5sDXood26BOKPWuoQWOa LK9NK9fKpzCURwZnDwFdpv7joSYlt8YoFAgIlLHQqzUwVIjzTpd3BVBlMqcaODV5eOyH 08Qw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=AkFbUT58; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b12si10048888pls.32.2019.02.11.06.39.31; Mon, 11 Feb 2019 06:39:48 -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=AkFbUT58; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731714AbfBKOii (ORCPT + 99 others); Mon, 11 Feb 2019 09:38:38 -0500 Received: from mail.kernel.org ([198.145.29.99]:48492 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731705AbfBKOig (ORCPT ); Mon, 11 Feb 2019 09:38:36 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 8C227222A2; Mon, 11 Feb 2019 14:38:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549895916; bh=GqyHSsxvWGWFrJGZCz1EHIzLuU/dB69TGY0U0BGPW14=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AkFbUT58OBYtcKr7/OLgtBsTzc9PNm/a/6SgNC3Z5GWNgbEVN2QI2+4haR2LesQy2 szjhbxVaq7jjCsKU4PBWB5zz23/sUw0h6nKAw1nakHDSRXj9cukbNetzC44XqV73hR eRJZ10jt+nz/qSa4atMLZfLndGL5OUHcLRjzPYW8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lior David , Maya Erez , Kalle Valo , Sasha Levin Subject: [PATCH 4.19 013/313] wil6210: fix memory leak in wil_find_tx_bcast_2 Date: Mon, 11 Feb 2019 15:14:53 +0100 Message-Id: <20190211141854.055059176@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211141852.749630980@linuxfoundation.org> References: <20190211141852.749630980@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 664497400c89a4d40aee51bcf48bbd2e4dc71104 ] A successful call to wil_tx_ring takes skb reference so it will only be freed in wil_tx_complete. Consume the skb in wil_find_tx_bcast_2 to prevent memory leak. Signed-off-by: Lior David Signed-off-by: Maya Erez Signed-off-by: Kalle Valo Signed-off-by: Sasha Levin --- drivers/net/wireless/ath/wil6210/txrx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/wireless/ath/wil6210/txrx.c b/drivers/net/wireless/ath/wil6210/txrx.c index 6a7943e487fb..75c8aa297107 100644 --- a/drivers/net/wireless/ath/wil6210/txrx.c +++ b/drivers/net/wireless/ath/wil6210/txrx.c @@ -1313,6 +1313,8 @@ found: wil_dbg_txrx(wil, "BCAST DUP -> ring %d\n", i); wil_set_da_for_vring(wil, skb2, i); wil_tx_ring(wil, vif, v2, skb2); + /* successful call to wil_tx_ring takes skb2 ref */ + dev_kfree_skb_any(skb2); } else { wil_err(wil, "skb_copy failed\n"); } -- 2.19.1