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=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=unavailable 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 5259BC31E40 for ; Mon, 12 Aug 2019 15:40:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2E58E20679 for ; Mon, 12 Aug 2019 15:40:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726496AbfHLPkH (ORCPT ); Mon, 12 Aug 2019 11:40:07 -0400 Received: from ajax.cs.uga.edu ([128.192.4.6]:57260 "EHLO ajax.cs.uga.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725901AbfHLPkH (ORCPT ); Mon, 12 Aug 2019 11:40:07 -0400 X-Greylist: delayed 3763 seconds by postgrey-1.27 at vger.kernel.org; Mon, 12 Aug 2019 11:40:06 EDT Received: from mail-lj1-f174.google.com (mail-lj1-f174.google.com [209.85.208.174]) (authenticated bits=0) by ajax.cs.uga.edu (8.14.4/8.14.4) with ESMTP id x7CEbLnw046789 (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 12 Aug 2019 10:37:22 -0400 Received: by mail-lj1-f174.google.com with SMTP id r9so98508484ljg.5; Mon, 12 Aug 2019 07:37:22 -0700 (PDT) X-Gm-Message-State: APjAAAUq4y/aUsIswoRcA+NYjGPlUsoFngqk9beTMkpc7wNU561pK+Ts 7F2Hrk5hqsL12tGCbzfonO8VhlAZuqIGNGzLpc8= X-Google-Smtp-Source: APXvYqwHjweXtAnZiiWTex2gV+573FnnCM4Bigr6V0xRAj2PUVm5tKqJ0aEvN23cJIb7jhc7vNyJ3r75T6pPOtCVtDA= X-Received: by 2002:a2e:3c12:: with SMTP id j18mr3801850lja.50.1565620641004; Mon, 12 Aug 2019 07:37:21 -0700 (PDT) MIME-Version: 1.0 References: <1565591765-6461-1-git-send-email-wenwen@cs.uga.edu> <75e09920-4ae3-0a19-4c2a-112d16bb81a5@mellanox.com> In-Reply-To: <75e09920-4ae3-0a19-4c2a-112d16bb81a5@mellanox.com> From: Wenwen Wang Date: Mon, 12 Aug 2019 10:36:44 -0400 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH] net/mlx4_en: fix a memory leak bug To: Tariq Toukan Cc: "David S. Miller" , "open list:MELLANOX ETHERNET DRIVER (mlx4_en)" , "open list:MELLANOX MLX4 core VPI driver" , open list , Wenwen Wang Content-Type: text/plain; charset="UTF-8" Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org On Mon, Aug 12, 2019 at 5:05 AM Tariq Toukan wrote: > > Hi Wenwen, > > Thanks for your patch. > > On 8/12/2019 9:36 AM, Wenwen Wang wrote: > > In mlx4_en_config_rss_steer(), 'rss_map->indir_qp' is allocated through > > kzalloc(). After that, mlx4_qp_alloc() is invoked to configure RSS > > indirection. However, if mlx4_qp_alloc() fails, the allocated > > 'rss_map->indir_qp' is not deallocated, leading to a memory leak bug. > > > > To fix the above issue, add the 'mlx4_err' label to free > > 'rss_map->indir_qp'. > > > > Add a Fixes line. > > > Signed-off-by: Wenwen Wang > --- > > drivers/net/ethernet/mellanox/mlx4/en_rx.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c > > index 6c01314..9476dbd 100644 > > --- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c > > +++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c > > @@ -1187,7 +1187,7 @@ int mlx4_en_config_rss_steer(struct mlx4_en_priv *priv) > > err = mlx4_qp_alloc(mdev->dev, priv->base_qpn, rss_map->indir_qp); > > if (err) { > > en_err(priv, "Failed to allocate RSS indirection QP\n"); > > - goto rss_err; > > + goto mlx4_err; > > } > > > > rss_map->indir_qp->event = mlx4_en_sqp_event; > > @@ -1241,6 +1241,7 @@ int mlx4_en_config_rss_steer(struct mlx4_en_priv *priv) > > MLX4_QP_STATE_RST, NULL, 0, 0, rss_map->indir_qp); > > mlx4_qp_remove(mdev->dev, rss_map->indir_qp); > > mlx4_qp_free(mdev->dev, rss_map->indir_qp); > > +mlx4_err: > > I don't like the label name. It's too general and not informative. > Maybe qp_alloc_err? Thanks! I will rework the patch. Wenwen