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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 1CC30C433EF for ; Sun, 8 Sep 2019 12:52:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E9E392082C for ; Sun, 8 Sep 2019 12:52:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567947138; bh=74PnI98VWknUo3UVhZAutMqvroPbG035EZ46IpUZUHw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2k7xOKAcupbm8ZsVBerBrgndBSo55LhJ3e0XqvKqQcj1cC2ohk/22+1y8aqXyUqRl nCsENcifn/HvlLYXNy9xNGXD45hNfmYlvDL3qZUK7FJKb+6qrHBTCKudytnzMJ7o9t luooEeqvcWZg3Eb8thiYfhWDvAdIXTYJfnrnR9pQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732957AbfIHMwP (ORCPT ); Sun, 8 Sep 2019 08:52:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:44326 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732946AbfIHMwO (ORCPT ); Sun, 8 Sep 2019 08:52:14 -0400 Received: from localhost (unknown [62.28.240.114]) (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 6E85C21924; Sun, 8 Sep 2019 12:52:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567947133; bh=74PnI98VWknUo3UVhZAutMqvroPbG035EZ46IpUZUHw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zqLgZUsgqRQ0uTmwkqPjms3aQ9XPjBgKJzqWmgXxKRZbx4If87+XRIMX/pmOEqP0c HFyaZrQalm0qXdvyBLK3WVEIqBr8szk6au+1DqRiQD8WaoulK08hbPQvaw6cTNMYvT 8XNCKnDA88TE4kkab6B9jvMbtmLc2Ow4SbsK/GC0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wenwen Wang , Leon Romanovsky , Doug Ledford , Sasha Levin Subject: [PATCH 5.2 74/94] IB/mlx4: Fix memory leaks Date: Sun, 8 Sep 2019 13:42:10 +0100 Message-Id: <20190908121152.551278560@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190908121150.420989666@linuxfoundation.org> References: <20190908121150.420989666@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit 5c1baaa82cea2c815a5180ded402a7cd455d1810 ] In mlx4_ib_alloc_pv_bufs(), 'tun_qp->tx_ring' is allocated through kcalloc(). However, it is not always deallocated in the following execution if an error occurs, leading to memory leaks. To fix this issue, free 'tun_qp->tx_ring' whenever an error occurs. Signed-off-by: Wenwen Wang Acked-by: Leon Romanovsky Link: https://lore.kernel.org/r/1566159781-4642-1-git-send-email-wenwen@cs.uga.edu Signed-off-by: Doug Ledford Signed-off-by: Sasha Levin --- drivers/infiniband/hw/mlx4/mad.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c index 68c951491a08a..57079110af9b5 100644 --- a/drivers/infiniband/hw/mlx4/mad.c +++ b/drivers/infiniband/hw/mlx4/mad.c @@ -1677,8 +1677,6 @@ tx_err: tx_buf_size, DMA_TO_DEVICE); kfree(tun_qp->tx_ring[i].buf.addr); } - kfree(tun_qp->tx_ring); - tun_qp->tx_ring = NULL; i = MLX4_NUM_TUNNEL_BUFS; err: while (i > 0) { @@ -1687,6 +1685,8 @@ err: rx_buf_size, DMA_FROM_DEVICE); kfree(tun_qp->ring[i].addr); } + kfree(tun_qp->tx_ring); + tun_qp->tx_ring = NULL; kfree(tun_qp->ring); tun_qp->ring = NULL; return -ENOMEM; -- 2.20.1