From: Tariq Toukan <tariqt@mellanox.com>
To: Wenwen Wang <wenwen@cs.uga.edu>
Cc: Tariq Toukan <tariqt@mellanox.com>,
"David S. Miller" <davem@davemloft.net>,
"open list:MELLANOX ETHERNET DRIVER (mlx4_en)"
<netdev@vger.kernel.org>,
"open list:MELLANOX MLX4 core VPI driver"
<linux-rdma@vger.kernel.org>,
open list <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] net/mlx4_en: fix a memory leak bug
Date: Mon, 12 Aug 2019 09:04:59 +0000 [thread overview]
Message-ID: <75e09920-4ae3-0a19-4c2a-112d16bb81a5@mellanox.com> (raw)
In-Reply-To: <1565591765-6461-1-git-send-email-wenwen@cs.uga.edu>
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 <wenwen@cs.uga.edu> > ---
> 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?
> kfree(rss_map->indir_qp);
> rss_map->indir_qp = NULL;
> rss_err:
>
next prev parent reply other threads:[~2019-08-12 9:05 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-12 6:36 [PATCH] net/mlx4_en: fix a memory leak bug Wenwen Wang
2019-08-12 9:04 ` Tariq Toukan [this message]
2019-08-12 14:36 ` Wenwen Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=75e09920-4ae3-0a19-4c2a-112d16bb81a5@mellanox.com \
--to=tariqt@mellanox.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=wenwen@cs.uga.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).