From: Leon Romanovsky <leon@kernel.org>
To: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Saeed Mahameed <saeedm@mellanox.com>,
Vu Pham <vuhuong@mellanox.com>, Jakub Kicinski <kuba@kernel.org>,
linux-rdma@vger.kernel.org, linux-netdev <netdev@vger.kernel.org>
Subject: Re: [PATCH] net/mlx5: E-Switch, Fix some error pointer dereferences
Date: Thu, 4 Jun 2020 13:32:55 +0300 [thread overview]
Message-ID: <20200604103255.GA8834@unreal> (raw)
In-Reply-To: <20200603175436.GD18931@mwanda>
+ netdev
On Wed, Jun 03, 2020 at 08:54:36PM +0300, Dan Carpenter wrote:
> We can't leave "counter" set to an error pointer. Otherwise either it
> will lead to an error pointer dereference later in the function or it
> leads to an error pointer dereference when we call mlx5_fc_destroy().
>
> Fixes: 07bab9502641d ("net/mlx5: E-Switch, Refactor eswitch ingress acl codes")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
> .../net/ethernet/mellanox/mlx5/core/esw/acl/ingress_lgcy.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/esw/acl/ingress_lgcy.c b/drivers/net/ethernet/mellanox/mlx5/core/esw/acl/ingress_lgcy.c
> index 9bda4fe2eafa7..5dc335e621c57 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/esw/acl/ingress_lgcy.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/esw/acl/ingress_lgcy.c
> @@ -162,10 +162,12 @@ int esw_acl_ingress_lgcy_setup(struct mlx5_eswitch *esw,
>
> if (MLX5_CAP_ESW_INGRESS_ACL(esw->dev, flow_counter)) {
> counter = mlx5_fc_create(esw->dev, false);
> - if (IS_ERR(counter))
> + if (IS_ERR(counter)) {
> esw_warn(esw->dev,
> "vport[%d] configure ingress drop rule counter failed\n",
> vport->vport);
> + counter = NULL;
> + }
> vport->ingress.legacy.drop_counter = counter;
> }
>
> @@ -272,7 +274,7 @@ void esw_acl_ingress_lgcy_cleanup(struct mlx5_eswitch *esw,
> esw_acl_ingress_table_destroy(vport);
>
> clean_drop_counter:
> - if (!IS_ERR_OR_NULL(vport->ingress.legacy.drop_counter)) {
> + if (vport->ingress.legacy.drop_counter) {
> mlx5_fc_destroy(esw->dev, vport->ingress.legacy.drop_counter);
> vport->ingress.legacy.drop_counter = NULL;
> }
> --
> 2.26.2
>
next parent reply other threads:[~2020-06-04 10:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20200603175436.GD18931@mwanda>
2020-06-04 10:32 ` Leon Romanovsky [this message]
2020-06-05 10:52 ` [PATCH] net/mlx5: E-Switch, Fix some error pointer dereferences Dan Carpenter
2020-06-07 6:25 ` Leon Romanovsky
2020-06-08 13:31 ` Dan Carpenter
2020-06-11 22:06 ` Saeed Mahameed
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=20200604103255.GA8834@unreal \
--to=leon@kernel.org \
--cc=dan.carpenter@oracle.com \
--cc=kuba@kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=saeedm@mellanox.com \
--cc=vuhuong@mellanox.com \
/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).