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,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 246EBC43331 for ; Mon, 11 Nov 2019 18:56:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E740620818 for ; Mon, 11 Nov 2019 18:56:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573498574; bh=sjLZBAzcI2tBfauyZGEYtWsLqWgYIqS9Vl/deyM0PPo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MtQKNMXFME3vi/jrLmQNUVNfNqgzB3AKydGHXxiXp1CgJZQdeY6DkGwhtVLRpAnPl 9DF4JF4a0VMmU3q39YCIMYut9OHYbmO0/KRRHKaxPyuAtEtNoqfm/MGcKDVzXdGuSX eOOu9kD0yhNReGbTqMZ0NEUfG4vgCaukQ2yU5uCw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730541AbfKKS4N (ORCPT ); Mon, 11 Nov 2019 13:56:13 -0500 Received: from mail.kernel.org ([198.145.29.99]:54256 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730389AbfKKS4M (ORCPT ); Mon, 11 Nov 2019 13:56: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 CB86F20818; Mon, 11 Nov 2019 18:56:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573498571; bh=sjLZBAzcI2tBfauyZGEYtWsLqWgYIqS9Vl/deyM0PPo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ymbbcUoFDedAI/Ir8rjmXm2yvYs5oI6C/itIaN9EFEBDcROGgYt9baef1iY5ZXZ3A ec6ZJZdjkn9gazig+O6epp8MJ6e3NMtmMYarFckSh99ft3g9Foi0aPgmSekYYhY20P 53wXHHWVIBwSMafi0oMPnQNc0cQfntjbVo6aq0E8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Navid Emamdoost , Saeed Mahameed , Sasha Levin Subject: [PATCH 5.3 108/193] net/mlx5: fix memory leak in mlx5_fw_fatal_reporter_dump Date: Mon, 11 Nov 2019 19:28:10 +0100 Message-Id: <20191111181509.095939043@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191111181459.850623879@linuxfoundation.org> References: <20191111181459.850623879@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 From: Navid Emamdoost [ Upstream commit c7ed6d0183d5ea9bc31bcaeeba4070bd62546471 ] In mlx5_fw_fatal_reporter_dump if mlx5_crdump_collect fails the allocated memory for cr_data must be released otherwise there will be memory leak. To fix this, this commit changes the return instruction into goto error handling. Fixes: 9b1f29823605 ("net/mlx5: Add support for FW fatal reporter dump") Signed-off-by: Navid Emamdoost Signed-off-by: Saeed Mahameed Signed-off-by: Sasha Levin --- drivers/net/ethernet/mellanox/mlx5/core/health.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/health.c b/drivers/net/ethernet/mellanox/mlx5/core/health.c index d685122d9ff76..c07f3154437c6 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/health.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/health.c @@ -572,7 +572,7 @@ mlx5_fw_fatal_reporter_dump(struct devlink_health_reporter *reporter, return -ENOMEM; err = mlx5_crdump_collect(dev, cr_data); if (err) - return err; + goto free_data; if (priv_ctx) { struct mlx5_fw_reporter_ctx *fw_reporter_ctx = priv_ctx; -- 2.20.1