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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9C1ECEB64DA for ; Wed, 5 Jul 2023 08:24:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229906AbjGEIYF (ORCPT ); Wed, 5 Jul 2023 04:24:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49112 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231317AbjGEIYA (ORCPT ); Wed, 5 Jul 2023 04:24:00 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 30B3BC1 for ; Wed, 5 Jul 2023 01:23:59 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id BA1B961489 for ; Wed, 5 Jul 2023 08:23:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5EA9CC433C8; Wed, 5 Jul 2023 08:23:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1688545438; bh=jL2t6AUn6hzbYzzckYRgVf8ByWotOQ4NEXr2JAdtcG8=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=pYj6Fq/hWszOWdJeF3FLgviiHyu+RFMMAEv9MVzuLlx+/5qZkje15/10LtaGmFqts EW4sAT73wesgPmKBoIgnkjjDMQ3ofzkMuj4IccJ74fFLmAXMmrPOIIf+2s516fiMDS 9kDlWt58wbmSz3X/ColOvvMhIiUHPBZaFVocdlSYd4LntXEeVDVY7Enp1y2n4X9WxU 8ItoG+XjmvgpBQ0/SvbrVnEgqmnL26c5oVxRjH58gqgLL5+1my5bf4TRu/6WM7MDbx IpqL0xd/mieDiqTkIVIqEpzfT5Rl3MGHJj3/L6ahYeq4/r8v+WFnoClLmIhAIrNV4/ RjDUIrGURgbHg== Date: Wed, 5 Jul 2023 11:23:53 +0300 From: Leon Romanovsky To: Simon Horman Cc: Zhengchao Shao , netdev@vger.kernel.org, linux-rdma@vger.kernel.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, valex@nvidia.com, kliteyn@nvidia.com, mbloch@nvidia.com, danielj@nvidia.com, erezsh@mellanox.com, saeedm@nvidia.com, weiyongjun1@huawei.com, yuehaibing@huawei.com Subject: Re: [PATCH net] net/mlx5: DR, fix memory leak in mlx5dr_cmd_create_reformat_ctx Message-ID: <20230705082353.GJ6455@unreal> References: <20230704033308.3773764-1-shaozhengchao@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org On Tue, Jul 04, 2023 at 03:40:44PM +0100, Simon Horman wrote: > On Tue, Jul 04, 2023 at 11:33:08AM +0800, Zhengchao Shao wrote: > > when mlx5_cmd_exec failed in mlx5dr_cmd_create_reformat_ctx, the memory > > pointed by 'in' is not released, which will cause memory leak. Move memory > > release after mlx5_cmd_exec. > > > > Fixes: 1d9186476e12 ("net/mlx5: DR, Add direct rule command utilities") > > Signed-off-by: Zhengchao Shao > > --- > > drivers/net/ethernet/mellanox/mlx5/core/steering/dr_cmd.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_cmd.c > > index 7491911ebcb5..cf5820744e99 100644 > > --- a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_cmd.c > > +++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_cmd.c > > @@ -563,11 +563,11 @@ int mlx5dr_cmd_create_reformat_ctx(struct mlx5_core_dev *mdev, > > memcpy(pdata, reformat_data, reformat_size); > > > > err = mlx5_cmd_exec(mdev, in, inlen, out, sizeof(out)); > > + kvfree(in); > > if (err) > > return err; > > > > *reformat_id = MLX5_GET(alloc_packet_reformat_context_out, out, packet_reformat_id); > > - kvfree(in); > > > > return err; > > } > > Hi Zhengchao Shao, > > I agree this is a correct fix. > However, I think a more idiomatic approach to this problem > would be to use a goto label. Something like this (completely untested!). Thanks, your change looks more natural to me. > > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_cmd.c > index 7491911ebcb5..8c2a34a0d6be 100644 > --- a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_cmd.c > +++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_cmd.c > @@ -564,11 +564,12 @@ int mlx5dr_cmd_create_reformat_ctx(struct mlx5_core_dev *mdev, > > err = mlx5_cmd_exec(mdev, in, inlen, out, sizeof(out)); > if (err) > - return err; > + goto err_free_in; > > *reformat_id = MLX5_GET(alloc_packet_reformat_context_out, out, packet_reformat_id); > - kvfree(in); > > +err_free_in: > + kvfree(in); > return err; > } >