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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 9B377C2D0CE for ; Sun, 29 Dec 2019 17:29:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 71186207FF for ; Sun, 29 Dec 2019 17:29:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577640555; bh=vMDcMOVyjv3MlKXLr1PORTqlvOaoEsGFl21R5hElLxY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=NNYLC3W5HkKA/IQBrE0gJ0U2jBv3Rx+QbPuDu0g4OHkh1ptMgTSTE3MDbHavzLnRO 8Mdyz+EpX/hqvN1v5lItPp5GfN86WoUm5RexGx5ckho1jr8AHcxgi+gOnVyC5AJzie sxqmITh/Z17ozboV7V0OkV1DcziveUbYHhe43fxw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728752AbfL2R3O (ORCPT ); Sun, 29 Dec 2019 12:29:14 -0500 Received: from mail.kernel.org ([198.145.29.99]:53478 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728730AbfL2R3M (ORCPT ); Sun, 29 Dec 2019 12:29:12 -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 8088D20409; Sun, 29 Dec 2019 17:29:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577640552; bh=vMDcMOVyjv3MlKXLr1PORTqlvOaoEsGFl21R5hElLxY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UZAglsrvTHODudUn73t7gZEUs8XowKontrBmcWIZ/ajRNRYf7ooFsJpPWUaj3W6mI cY1LasF0ljiXRy1Ez/D65HVpdhy62Jfhir8KY8S0YxANAj4ynlKrCu/VTyd3j8nPHV 8tK3sZh7413CGpcciAtIXoqPdD1lDy/yVCmvf0Qw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Navid Emamdoost , Linus Walleij , "David S. Miller" Subject: [PATCH 4.19 005/219] net: gemini: Fix memory leak in gmac_setup_txqs Date: Sun, 29 Dec 2019 18:16:47 +0100 Message-Id: <20191229162509.837005119@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191229162508.458551679@linuxfoundation.org> References: <20191229162508.458551679@linuxfoundation.org> User-Agent: quilt/0.66 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 From: Navid Emamdoost [ Upstream commit f37f710353677639bc5d37ee785335994adf2529 ] In the implementation of gmac_setup_txqs() the allocated desc_ring is leaked if TX queue base is not aligned. Release it via dma_free_coherent. Fixes: 4d5ae32f5e1e ("net: ethernet: Add a driver for Gemini gigabit ethernet") Signed-off-by: Navid Emamdoost Reviewed-by: Linus Walleij Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/cortina/gemini.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/net/ethernet/cortina/gemini.c +++ b/drivers/net/ethernet/cortina/gemini.c @@ -577,6 +577,8 @@ static int gmac_setup_txqs(struct net_de if (port->txq_dma_base & ~DMA_Q_BASE_MASK) { dev_warn(geth->dev, "TX queue base is not aligned\n"); + dma_free_coherent(geth->dev, len * sizeof(*desc_ring), + desc_ring, port->txq_dma_base); kfree(skb_tab); return -ENOMEM; }