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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 6B3B0C433E0 for ; Thu, 28 May 2020 11:59:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3858221655 for ; Thu, 28 May 2020 11:59:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590667142; bh=Ixh+I5kU+DvxG8Qgl82jKqK0GAhQjdANO/gyeG14a0U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=LU4jZCozo2HQFyXSJNzyVUiHg3UHoz7UUfKFbo6ojJTHSqBBEFi77hKLI5McXxa30 Q2u2pRDBIMss3sRt4ndwCDMnfETIY8TvYHMwb85V+nhfEC3Qfq+TpoKpd/D3i3ABgI sH17T35+eE9yCIfyF1jY01JiTMy5P21eqiwlGX+M= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389319AbgE1L7B (ORCPT ); Thu, 28 May 2020 07:59:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:51318 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389220AbgE1L6U (ORCPT ); Thu, 28 May 2020 07:58:20 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BA21421841; Thu, 28 May 2020 11:58:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590667100; bh=Ixh+I5kU+DvxG8Qgl82jKqK0GAhQjdANO/gyeG14a0U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t0HLuaKlmzoFOz2V9beXi1HH7OU3x3panrJPqG4Waug0tCibH9vWigL6IDH1U1aFK ncY3ClmtRkA0JWPOJQ97iY4y7FDaA2smboi5Omkb1puT1UI4kIJhcRPvUYQgjU8Q5M wg62M8MelO0+cYvDcPOUPQ0Y4IcYtbpWVbawHCyQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Qiushi Wu , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 7/7] net/mlx4_core: fix a memory leak bug. Date: Thu, 28 May 2020 07:58:11 -0400 Message-Id: <20200528115811.1406810-7-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200528115811.1406810-1-sashal@kernel.org> References: <20200528115811.1406810-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Qiushi Wu [ Upstream commit febfd9d3c7f74063e8e630b15413ca91b567f963 ] In function mlx4_opreq_action(), pointer "mailbox" is not released, when mlx4_cmd_box() return and error, causing a memory leak bug. Fix this issue by going to "out" label, mlx4_free_cmd_mailbox() can free this pointer. Fixes: fe6f700d6cbb ("net/mlx4_core: Respond to operation request by firmware") Signed-off-by: Qiushi Wu Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/mellanox/mlx4/fw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlx4/fw.c b/drivers/net/ethernet/mellanox/mlx4/fw.c index 5ac6e62f7dcc..0a4e9731d33b 100644 --- a/drivers/net/ethernet/mellanox/mlx4/fw.c +++ b/drivers/net/ethernet/mellanox/mlx4/fw.c @@ -2522,7 +2522,7 @@ void mlx4_opreq_action(struct work_struct *work) if (err) { mlx4_err(dev, "Failed to retrieve required operation: %d\n", err); - return; + goto out; } MLX4_GET(modifier, outbox, GET_OP_REQ_MODIFIER_OFFSET); MLX4_GET(token, outbox, GET_OP_REQ_TOKEN_OFFSET); -- 2.25.1