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 66140C433EF for ; Sun, 8 Sep 2019 12:45:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4142821A49 for ; Sun, 8 Sep 2019 12:45:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567946745; bh=lSgo35euyZz7QBUuY01GXmYbUwFWdCcynZ9Jy3WfGxs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=CzM4+hKn3TQyX9UQt7zqVTY6RjOz0nlV6pmyPB4FnxzpsKYm+Pkl+bQQl7rPMDR+c hcrE5+gW3MwI+Aihk6rV1uvbQGLTksgfXBK/DVs84MIfyMKnWM+c0ZfYcqY/kkSaOB I2J/Ow+fFA59lLL2CFDraRT4YrrztpUvPfSD1CvQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730174AbfIHMpo (ORCPT ); Sun, 8 Sep 2019 08:45:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:32882 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730189AbfIHMpn (ORCPT ); Sun, 8 Sep 2019 08:45:43 -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 61CB5216C8; Sun, 8 Sep 2019 12:45:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567946742; bh=lSgo35euyZz7QBUuY01GXmYbUwFWdCcynZ9Jy3WfGxs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hH0PNbTPTPDxEM6bTwIM8pMaoVkRVb9V7yUloF4weaM7plKs8PbbpgFMAiH/sjaiq A09QuEpSQCAj/zgAo4IWtNnl+Y6+i7voHyJFNDOi2JhvkEA6egeFp/KnPoYZt4FZ1R QSGEJ3qAX5IHewfFR3BZINHbO4I98AGYMfZshbp4= 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 4.14 23/40] IB/mlx4: Fix memory leaks Date: Sun, 8 Sep 2019 13:41:56 +0100 Message-Id: <20190908121124.574613231@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190908121114.260662089@linuxfoundation.org> References: <20190908121114.260662089@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 d604b3d5aa3e4..c69158ccab822 100644 --- a/drivers/infiniband/hw/mlx4/mad.c +++ b/drivers/infiniband/hw/mlx4/mad.c @@ -1680,8 +1680,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) { @@ -1690,6 +1688,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