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.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, 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 EE571C43603 for ; Sun, 15 Dec 2019 01:11:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B17EE207FD for ; Sun, 15 Dec 2019 01:11:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="mm8H9mwC" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727126AbfLOBLD (ORCPT ); Sat, 14 Dec 2019 20:11:03 -0500 Received: from mail-il1-f195.google.com ([209.85.166.195]:39033 "EHLO mail-il1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726948AbfLOBLD (ORCPT ); Sat, 14 Dec 2019 20:11:03 -0500 Received: by mail-il1-f195.google.com with SMTP id n1so2614844ilm.6; Sat, 14 Dec 2019 17:11:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=iCgRvU1WGRJdB8v0mlRWij6VbYbiUNZ9qlhjDWyv8b8=; b=mm8H9mwC/H/B8L0ty+x6fcNvz2ecrsgaucPP5ScxIuULp9xV8c3kSOfLyVGkYoQpn7 uPXaE/CijJAssAhAeilkHYXZLa5R/2oicE0u0UnqKFdBpeQUFPDWIE5xaL21KMv3yrKt 1joiBx5xrRHuWNl6KMt1g2wW2p5lwVHRxxfFbwcUBJ8F1QSMRkEDGAfWAwx8WvipCkaF NFBphQv26wL4csd5dfB6/GZfyJ4yJEs5yWtfF98WpHkQGeGigkdWbt6K8QLgCssj8PCM 0ScrtnuJO3zF57oGe5SIDAeVJV6N/vzck3Y5jtHGa52HTIu+yL2NMDLe6nebM1P8TB1d Osqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=iCgRvU1WGRJdB8v0mlRWij6VbYbiUNZ9qlhjDWyv8b8=; b=M42Cu2hKNcZD2fo2pSOfRKRz/MRNhcOSqKOVZvUAKqcHqOYK6S+jQ8M/5cvjlG1xvP zojyj6YsFMjdy/XWO7liAJTI4CjvjaBYwcyHaqYY5gsTHIHVdvtYDie7gZZRh6uwaEMx 2V17Lbjh68P69fWzeaqgUjrzH0jlAx37ib5sm8Oi7Y6QYATyQ3OJF4g9DsAD1bRpSKn+ 6/0eeNGM5obbv5SoezdkujiGCXidcKVH5daxqqI5h1oI8w0x4jJBUoLUy68w8qzOHTcy 8IofWhb+evR9V4xWTcJqMCFIP4lxCpnlNZUOuTyl3MuqYKomIUjEBOF/IyMMzGS7dQUt UXzQ== X-Gm-Message-State: APjAAAU6i2Sg0tlbeiZSDjaIF5V/+iAg62T62cxtZnP24od/9cM80INh HVRAGqMKXysHQrSohyJntT4= X-Google-Smtp-Source: APXvYqwKeEjguHOSD5k7hXba9znk0S8i3ioaEZxvZ7qBuvFHYAtLl17fRxCyhC2/A6BeFGt22r3lwA== X-Received: by 2002:a92:5c8f:: with SMTP id d15mr6913133ilg.102.1576372262269; Sat, 14 Dec 2019 17:11:02 -0800 (PST) Received: from cs-dulles.cs.umn.edu (cs-dulles.cs.umn.edu. [128.101.35.54]) by smtp.googlemail.com with ESMTPSA id 129sm3173169iox.84.2019.12.14.17.11.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Dec 2019 17:11:01 -0800 (PST) From: Navid Emamdoost To: Hans Ulli Kroll , Linus Walleij , "David S. Miller" , =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= , linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: emamd001@umn.edu, Navid Emamdoost Subject: [PATCH] net: gemini: Fix memory leak in gmac_setup_txqs Date: Sat, 14 Dec 2019 19:10:44 -0600 Message-Id: <20191215011045.15453-1-navid.emamdoost@gmail.com> X-Mailer: git-send-email 2.17.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- drivers/net/ethernet/cortina/gemini.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/cortina/gemini.c b/drivers/net/ethernet/cortina/gemini.c index a8f4c69252ff..3a796fe099dd 100644 --- a/drivers/net/ethernet/cortina/gemini.c +++ b/drivers/net/ethernet/cortina/gemini.c @@ -576,6 +576,8 @@ static int gmac_setup_txqs(struct net_device *netdev) 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; } -- 2.17.1 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.5 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, 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 12BB7C43603 for ; Sun, 15 Dec 2019 01:11:12 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id DA67F207FD for ; Sun, 15 Dec 2019 01:11:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="qEooRV4y"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="mm8H9mwC" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DA67F207FD Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject: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=VIb3wVpvkr767cU26/PWWRvv8vK90PovlG0saKjhQSU=; b=qEo oRV4y9rSr53StM1ZktfknwMdWEDKGZTOaiJD5WMFVXCOWfGMcVlK8U9zo1ACLQiw6GON8cPDK+cCn GXpOtMhbgnEan/Rs3vq2dLm2z2mC2r2VB0BDuf5dKCjWVRcc9ybVT8+2SLwnEumRB8ixX9tNyL7qm 7G1eTmn+BQJ/qbP3rnUNDvfS5KLpjp8mhC4BcehCUn0/Lh/sCp1yCV2GRgRHqB2DY1vVdail1i4aZ veTDBxEo6S3HVeUPeAnilTtMrWoRNkUG5SjV1JBFRk6e7A9DgS/H9jLtvDI6ckWiZ16AFjY3c7wg8 Bgs0ZYZPbgFG0JqHONWMc1vsve4huZg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1igIRC-0000Re-Kp; Sun, 15 Dec 2019 01:11:10 +0000 Received: from mail-il1-x142.google.com ([2607:f8b0:4864:20::142]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1igIR5-0000RG-Ah for linux-arm-kernel@lists.infradead.org; Sun, 15 Dec 2019 01:11:08 +0000 Received: by mail-il1-x142.google.com with SMTP id p8so2576819iln.12 for ; Sat, 14 Dec 2019 17:11:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=iCgRvU1WGRJdB8v0mlRWij6VbYbiUNZ9qlhjDWyv8b8=; b=mm8H9mwC/H/B8L0ty+x6fcNvz2ecrsgaucPP5ScxIuULp9xV8c3kSOfLyVGkYoQpn7 uPXaE/CijJAssAhAeilkHYXZLa5R/2oicE0u0UnqKFdBpeQUFPDWIE5xaL21KMv3yrKt 1joiBx5xrRHuWNl6KMt1g2wW2p5lwVHRxxfFbwcUBJ8F1QSMRkEDGAfWAwx8WvipCkaF NFBphQv26wL4csd5dfB6/GZfyJ4yJEs5yWtfF98WpHkQGeGigkdWbt6K8QLgCssj8PCM 0ScrtnuJO3zF57oGe5SIDAeVJV6N/vzck3Y5jtHGa52HTIu+yL2NMDLe6nebM1P8TB1d Osqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=iCgRvU1WGRJdB8v0mlRWij6VbYbiUNZ9qlhjDWyv8b8=; b=otuJtSbja3RGxHv8LjE90ivrBxSuU//5gxduOVNIv79O6wDpDqVumaYDQYI+szFgSj l018j2AVDwQkJWLK0Hdi6O51yVAYA0Tw1RhpjiYmzzS6ijnm0F+0Xcb/mHa8/dQQyHhs bQKZnH6aw42eOb54XsQ8fxKdNA5lXy7FiaMOdtl1K+bvfgpSzAKKHfZGM/DjefNEFDDK bz1TQekh4sqLx8CBiL/lRgCewamYKOWLZ4r3cBnYyrghfcYkTW1joT1lpm2WF9Sezt91 FCe3XouU4MF58jv2JNQ+41yC13/bTKbW5R0fj7qJo/CA9ENC+KDr724CRsrdUYCLDJ6t 1n6A== X-Gm-Message-State: APjAAAWEiHBMpxTEMl698JG+XuaPixWjkksrcES7hNdTlHKrAw1+XkDw TrMQb38TV85Q1hz9G0qWhY8= X-Google-Smtp-Source: APXvYqwKeEjguHOSD5k7hXba9znk0S8i3ioaEZxvZ7qBuvFHYAtLl17fRxCyhC2/A6BeFGt22r3lwA== X-Received: by 2002:a92:5c8f:: with SMTP id d15mr6913133ilg.102.1576372262269; Sat, 14 Dec 2019 17:11:02 -0800 (PST) Received: from cs-dulles.cs.umn.edu (cs-dulles.cs.umn.edu. [128.101.35.54]) by smtp.googlemail.com with ESMTPSA id 129sm3173169iox.84.2019.12.14.17.11.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Dec 2019 17:11:01 -0800 (PST) From: Navid Emamdoost To: Hans Ulli Kroll , Linus Walleij , "David S. Miller" , =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= , linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] net: gemini: Fix memory leak in gmac_setup_txqs Date: Sat, 14 Dec 2019 19:10:44 -0600 Message-Id: <20191215011045.15453-1-navid.emamdoost@gmail.com> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191214_171103_394298_AEE9CD33 X-CRM114-Status: UNSURE ( 9.48 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: emamd001@umn.edu, Navid Emamdoost MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 --- drivers/net/ethernet/cortina/gemini.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/cortina/gemini.c b/drivers/net/ethernet/cortina/gemini.c index a8f4c69252ff..3a796fe099dd 100644 --- a/drivers/net/ethernet/cortina/gemini.c +++ b/drivers/net/ethernet/cortina/gemini.c @@ -576,6 +576,8 @@ static int gmac_setup_txqs(struct net_device *netdev) 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; } -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel