Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4688242pxj; Wed, 12 May 2021 10:55:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz7LHgyCyogFL5W3YHiZAmUGFYHTvQbO3GszbFW188lTJi1pkF08U+8B21/PsOoHzBjwc/v X-Received: by 2002:a2e:bb98:: with SMTP id y24mr22990491lje.458.1620842051392; Wed, 12 May 2021 10:54:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620842051; cv=none; d=google.com; s=arc-20160816; b=uQjxWNIQRWR7CNk9AWUVt21a8Pbjq4uBJ1zTEEIwib0Zj8FmHkfBDerBu6kG4N5clg n/tnpzqELuJAJlg6Qmhrk3iuVECkw7ecYX8vHSSxTPfUbGF5TocWEj3FAfqCKNEaEfUb WnXy7Sj1/w4VOuiMQWl7T9IRITrIB6LNiBWd8CilqRc5PKAUayeXmP+ut0i5gI+Pedpl CppaCMT5b4YItzKHpMG+5M+oKX8QR7ku6X5+BAYeeiWX/Ozx4EOeB8N7zIsyS6BXPTb1 rWIufc5QFj1qA/u+AUKKIVfYC7EnvcKpv8TfTFmeHWkyaXPVxnmfhJN6O/xcVmGu0Il9 /RKw== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=s7RIgjqBECdPq/FPI/yZqUrlySKBa3RKHSnFIzrqJ8E=; b=0koFuWEvWj9Vw2bok1bDgeBeGXUtJ4/jTE/tM2fya3pi5gEMqL12aRrFp+kPT7nXJd sBekuwaVLxi8zZu7r2KRNQO/ggRsWO2U+/vGn6g/RB1PTc55/Wr5FUPUpAI/Kq+if3v7 eEQ9aaL9JKmwIf863tNgQd6fjcdiHcGE6Wk9i2A76o5JlAV/StUkyGXhiAKMgsWlEgJ9 fsw2DmtiSZL5wRHCOEhW7RqMl0yzehtpj37py1QGHa+Fqxr3LBTWKSLv7Gkirn+jiwOF djimk4F8MTTdKwwyFqBXj8FJbi3ONaFTv5AKwbs4bt7Z+aGVDtOWgqYbK+Q0Rlul/0M5 bEOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="0khfh/9l"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u14si421114lfq.350.2021.05.12.10.53.40; Wed, 12 May 2021 10:54:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=@linuxfoundation.org header.s=korg header.b="0khfh/9l"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346403AbhELRpU (ORCPT + 99 others); Wed, 12 May 2021 13:45:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:59090 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240373AbhELQR4 (ORCPT ); Wed, 12 May 2021 12:17:56 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id BC81E619A1; Wed, 12 May 2021 15:43:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620834239; bh=yxWuWUXLICmglpa67NgIU1IjQoO4kS1LM+x4OlC3pNk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0khfh/9lqr6jq98V3+8pVxsgj0qrktsDC1l9tfDyZw4xkBAiBPvpQj4xDkKKxAKP+ JnIi7o6BFerjIYkX7UTc+jiWqijTckz+HUS4Pz1xFbOkHOFw2zzDkLBJBLQRZHDaxa /jnrBFrG9zpBWVah3ERgYu1rUR05lWKTL67+vdx4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ben Greear , Felix Fietkau , Sasha Levin Subject: [PATCH 5.11 464/601] mt76: mt7915: fix tx skb dma unmap Date: Wed, 12 May 2021 16:49:01 +0200 Message-Id: <20210512144843.118622831@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144827.811958675@linuxfoundation.org> References: <20210512144827.811958675@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Felix Fietkau [ Upstream commit 7dcf3c04f0aca746517a77433b33d40868ca4749 ] The first pointer in the txp needs to be unmapped as well, otherwise it will leak DMA mapping entries Reported-by: Ben Greear Fixes: 27d5c528a7ca ("mt76: fix double DMA unmap of the first buffer on 7615/7915") Signed-off-by: Felix Fietkau Signed-off-by: Sasha Levin --- drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c index c9dd6867e125..8a083304ab03 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c @@ -1082,7 +1082,7 @@ void mt7915_txp_skb_unmap(struct mt76_dev *dev, int i; txp = mt7915_txwi_to_txp(dev, t); - for (i = 1; i < txp->nbuf; i++) + for (i = 0; i < txp->nbuf; i++) dma_unmap_single(dev->dev, le32_to_cpu(txp->buf[i]), le16_to_cpu(txp->len[i]), DMA_TO_DEVICE); } -- 2.30.2