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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9B418C54E94 for ; Thu, 26 Jan 2023 10:17:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=JUc2mXXcPD3N2MUVjAdZqvJ+LqtNj2YZnaEr+rbF9XE=; b=LIgKb0lG4KwNHw 8kVqOys6XxHTAksjg0ucyfwMdOinCCMXKUut4P+cGXyPdX3/mfNPrgQe1TP2QTV98zjAzaZsCmWkD 386Q9KcOsr7c1f/CrugjTV/051kNUuyRvOHsaV+s7QhFtxQcYzPZOH8pQF/9SIPh/TJdgRq9fd+xP OC6wfS5fliikoBLvuimjjhWleqV83Va1kEHdRABal0E15BsAUNYLXpmT5npnB2FumayBkGUfM1has R8ZoG59ty7oy8GqNdIybCCwa4WSuCQ5XLgUpVlKcpnEIYYhUqS4kx4zZSPgVzqC1siFp8rcAJUdpS BbSzk6hv6wP+awT+mqNw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pKzJB-00AOcZ-D3; Thu, 26 Jan 2023 10:16:41 +0000 Received: from out4-smtp.messagingengine.com ([66.111.4.28]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pKzJ8-00AObo-Cu for linux-arm-kernel@lists.infradead.org; Thu, 26 Jan 2023 10:16:40 +0000 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id CDA985C00DA; Thu, 26 Jan 2023 05:16:29 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Thu, 26 Jan 2023 05:16:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=umbraculum.org; h=cc:cc:content-transfer-encoding:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:sender:subject :subject:to:to; s=fm2; t=1674728189; x=1674814589; bh=s9W/9MyKgS isyN6zGHmrgn0Oipj/EtVibkHLYyeuDVc=; b=dsge6GPzRlw9MWF79ytfvya17Y BNMGKRZx18MwVo1hntKB9c7cYDONDTJroJUgYjoSSEEq9Upt0dSFkq9Ae7o1mQhq DSywSSlxjhLYa+J7mpNSgZ6J8lLqKKLNLI4i3rcW5hOXcCKm+mHv5WYgZ/Zj3lKO 3MuHCpjmt4IlmhIWz+jrFwhwQ2uTvoIPdIG7zZFfLeAVpGle9UQHN5VhtYAOi9b0 K3BfahIuiYxcltkguJ+r2AJ6YRrlqj5u/eV4gye4Qpg5wZXjjoUapnr/tZkUo0FI gFsUuk7U2pxz3ppnqAOWnpItq5weeVjpyDCeNHEI07HyD5JuI+3zdgbjDgXw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:message-id :mime-version:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t= 1674728189; x=1674814589; bh=s9W/9MyKgSisyN6zGHmrgn0Oipj/EtVibkH LYyeuDVc=; b=mh6+nV3SaPKHsK0aW9l5M77NSTJfGt5Uy4g5XjB0bDU0G+iU3WN V0ebS2sjZG3zlg3ANlcpUeZnPobLqIBz+oXdcKVUWFyuq6QpRPPoG8LYnw1esfNj 42JKSjb28aGdyRd8C7FMUWApsXbsge6rXHyEMWd31+7gRU8GAFxVsWJpxZW5uDMn jgw/K3GAJlPGEzu8VS6tjE80xxKMYWy7285nmBCqcBEtkb6qEIYG8iuRcpMBvBUj EJ43BiVxqXbvIyFosoDT2GxMeQb2z+uNux4Qj8idp5IENx+pVHagirRwqgUYpo3U L81197OrSLeAanrlWqVYwh/WlINw4hfRl/Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedruddvgedgudefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertd ertddtnecuhfhrohhmpeflohhnrghsucfuuhhhrhcuvehhrhhishhtvghnshgvnhcuoehj shgtsehumhgsrhgrtghulhhumhdrohhrgheqnecuggftrfgrthhtvghrnhepfeevgeeihf dttdefvdegleehffevveejgefhtefhhedvjeefudfgfeeigfelgfelnecuvehluhhsthgv rhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepjhhstgesuhhmsghrrggtuh hluhhmrdhorhhg X-ME-Proxy: Feedback-ID: i06314781:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 26 Jan 2023 05:16:25 -0500 (EST) From: Jonas Suhr Christensen To: netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, michal.simek@xilinx.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, esben@geanix.com, Jonas Suhr Christensen Subject: [PATCH 1/2] net: ll_temac: fix DMA resources leak Date: Thu, 26 Jan 2023 11:16:06 +0100 Message-Id: <20230126101607.88407-1-jsc@umbraculum.org> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230126_021638_873978_DF8D99F4 X-CRM114-Status: GOOD ( 10.60 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add missing conversion of address when unmapping dma region causing unmapping to silently fail. At some point resulting in buffer overrun eg. when releasing device. Signed-off-by: Jonas Suhr Christensen --- drivers/net/ethernet/xilinx/ll_temac_main.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c index 1066420d6a83..66c04027f230 100644 --- a/drivers/net/ethernet/xilinx/ll_temac_main.c +++ b/drivers/net/ethernet/xilinx/ll_temac_main.c @@ -300,6 +300,7 @@ static void temac_dma_bd_release(struct net_device *ndev) { struct temac_local *lp = netdev_priv(ndev); int i; + struct cdmac_bd *bd; /* Reset Local Link (DMA) */ lp->dma_out(lp, DMA_CONTROL_REG, DMA_CONTROL_RST); @@ -307,9 +308,14 @@ static void temac_dma_bd_release(struct net_device *ndev) for (i = 0; i < lp->rx_bd_num; i++) { if (!lp->rx_skb[i]) break; - dma_unmap_single(ndev->dev.parent, lp->rx_bd_v[i].phys, + + bd = &lp->rx_bd_v[1]; + dma_unmap_single(ndev->dev.parent, be32_to_cpu(bd->phys), XTE_MAX_JUMBO_FRAME_SIZE, DMA_FROM_DEVICE); + bd->phys = 0; + bd->len = 0; dev_kfree_skb(lp->rx_skb[i]); + lp->rx_skb[i] = NULL; } if (lp->rx_bd_v) dma_free_coherent(ndev->dev.parent, -- 2.39.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel