* [PATCH 1/2 net-next] mlxsw: spectrum: Fix check for IS_ERR() instead of NULL
@ 2017-10-03 10:53 Dan Carpenter
2017-10-03 10:53 ` [PATCH 2/2 net-next] mlxsw: spectrum: Add missing error code on allocation failure Dan Carpenter
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Dan Carpenter @ 2017-10-03 10:53 UTC (permalink / raw)
To: Jiri Pirko, Yotam Gigi; +Cc: Ido Schimmel, netdev, kernel-janitors
mlxsw_afa_block_create() doesn't return error pointers, it returns NULL
on error.
Fixes: 0e14c7777acb ("mlxsw: spectrum: Add the multicast routing hardware logic")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_mr_tcam.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_mr_tcam.c
index cda9e9ad10e3..5e4ccbf17e3d 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_mr_tcam.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_mr_tcam.c
@@ -239,8 +239,8 @@ mlxsw_sp_mr_tcam_afa_block_create(struct mlxsw_sp *mlxsw_sp,
int err;
afa_block = mlxsw_afa_block_create(mlxsw_sp->afa);
- if (IS_ERR(afa_block))
- return afa_block;
+ if (!afa_block)
+ return ERR_PTR(-ENOMEM);
err = mlxsw_afa_block_append_counter(afa_block, counter_index);
if (err)
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2 net-next] mlxsw: spectrum: Add missing error code on allocation failure
2017-10-03 10:53 [PATCH 1/2 net-next] mlxsw: spectrum: Fix check for IS_ERR() instead of NULL Dan Carpenter
@ 2017-10-03 10:53 ` Dan Carpenter
2017-10-03 10:56 ` Yotam Gigi
2017-10-03 17:27 ` David Miller
2017-10-03 10:58 ` [PATCH 1/2 net-next] mlxsw: spectrum: Fix check for IS_ERR() instead of NULL Yotam Gigi
2017-10-03 17:27 ` David Miller
2 siblings, 2 replies; 6+ messages in thread
From: Dan Carpenter @ 2017-10-03 10:53 UTC (permalink / raw)
To: Jiri Pirko, Yotam Gigi; +Cc: Ido Schimmel, netdev, kernel-janitors
We accidentally return success if the kmalloc_array() call fails.
Fixes: 0e14c7777acb ("mlxsw: spectrum: Add the multicast routing hardware logic")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_mr_tcam.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_mr_tcam.c
index 5e4ccbf17e3d..839eadf0765b 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_mr_tcam.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_mr_tcam.c
@@ -763,8 +763,10 @@ mlxsw_sp_mr_tcam_region_init(struct mlxsw_sp *mlxsw_sp,
parman_prios = kmalloc_array(MLXSW_SP_MR_ROUTE_PRIO_MAX + 1,
sizeof(*parman_prios), GFP_KERNEL);
- if (!parman_prios)
+ if (!parman_prios) {
+ err = -ENOMEM;
goto err_parman_prios_alloc;
+ }
mr_tcam_region->parman_prios = parman_prios;
for (i = 0; i < MLXSW_SP_MR_ROUTE_PRIO_MAX + 1; i++)
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 2/2 net-next] mlxsw: spectrum: Add missing error code on allocation failure
2017-10-03 10:53 ` [PATCH 2/2 net-next] mlxsw: spectrum: Add missing error code on allocation failure Dan Carpenter
@ 2017-10-03 10:56 ` Yotam Gigi
2017-10-03 17:27 ` David Miller
1 sibling, 0 replies; 6+ messages in thread
From: Yotam Gigi @ 2017-10-03 10:56 UTC (permalink / raw)
To: Dan Carpenter, Jiri Pirko; +Cc: Ido Schimmel, netdev, kernel-janitors
On 10/03/2017 01:53 PM, Dan Carpenter wrote:
> We accidentally return success if the kmalloc_array() call fails.
>
> Fixes: 0e14c7777acb ("mlxsw: spectrum: Add the multicast routing hardware logic")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Yotam Gigi <yotamg@mellanox.com>
>
> diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_mr_tcam.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_mr_tcam.c
> index 5e4ccbf17e3d..839eadf0765b 100644
> --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_mr_tcam.c
> +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_mr_tcam.c
> @@ -763,8 +763,10 @@ mlxsw_sp_mr_tcam_region_init(struct mlxsw_sp *mlxsw_sp,
>
> parman_prios = kmalloc_array(MLXSW_SP_MR_ROUTE_PRIO_MAX + 1,
> sizeof(*parman_prios), GFP_KERNEL);
> - if (!parman_prios)
> + if (!parman_prios) {
> + err = -ENOMEM;
> goto err_parman_prios_alloc;
> + }
> mr_tcam_region->parman_prios = parman_prios;
>
> for (i = 0; i < MLXSW_SP_MR_ROUTE_PRIO_MAX + 1; i++)
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 2/2 net-next] mlxsw: spectrum: Add missing error code on allocation failure
2017-10-03 10:53 ` [PATCH 2/2 net-next] mlxsw: spectrum: Add missing error code on allocation failure Dan Carpenter
2017-10-03 10:56 ` Yotam Gigi
@ 2017-10-03 17:27 ` David Miller
1 sibling, 0 replies; 6+ messages in thread
From: David Miller @ 2017-10-03 17:27 UTC (permalink / raw)
To: dan.carpenter; +Cc: jiri, yotamg, idosch, netdev, kernel-janitors
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Tue, 3 Oct 2017 13:53:41 +0300
> We accidentally return success if the kmalloc_array() call fails.
>
> Fixes: 0e14c7777acb ("mlxsw: spectrum: Add the multicast routing hardware logic")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Applied.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2 net-next] mlxsw: spectrum: Fix check for IS_ERR() instead of NULL
2017-10-03 10:53 [PATCH 1/2 net-next] mlxsw: spectrum: Fix check for IS_ERR() instead of NULL Dan Carpenter
2017-10-03 10:53 ` [PATCH 2/2 net-next] mlxsw: spectrum: Add missing error code on allocation failure Dan Carpenter
@ 2017-10-03 10:58 ` Yotam Gigi
2017-10-03 17:27 ` David Miller
2 siblings, 0 replies; 6+ messages in thread
From: Yotam Gigi @ 2017-10-03 10:58 UTC (permalink / raw)
To: Dan Carpenter, Jiri Pirko; +Cc: Ido Schimmel, netdev, kernel-janitors
On 10/03/2017 01:53 PM, Dan Carpenter wrote:
> mlxsw_afa_block_create() doesn't return error pointers, it returns NULL
> on error.
>
> Fixes: 0e14c7777acb ("mlxsw: spectrum: Add the multicast routing hardware logic")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Yotam Gigi <yotamg@mellanox.com>
Thanks!
>
> diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_mr_tcam.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_mr_tcam.c
> index cda9e9ad10e3..5e4ccbf17e3d 100644
> --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_mr_tcam.c
> +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_mr_tcam.c
> @@ -239,8 +239,8 @@ mlxsw_sp_mr_tcam_afa_block_create(struct mlxsw_sp *mlxsw_sp,
> int err;
>
> afa_block = mlxsw_afa_block_create(mlxsw_sp->afa);
> - if (IS_ERR(afa_block))
> - return afa_block;
> + if (!afa_block)
> + return ERR_PTR(-ENOMEM);
>
> err = mlxsw_afa_block_append_counter(afa_block, counter_index);
> if (err)
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 1/2 net-next] mlxsw: spectrum: Fix check for IS_ERR() instead of NULL
2017-10-03 10:53 [PATCH 1/2 net-next] mlxsw: spectrum: Fix check for IS_ERR() instead of NULL Dan Carpenter
2017-10-03 10:53 ` [PATCH 2/2 net-next] mlxsw: spectrum: Add missing error code on allocation failure Dan Carpenter
2017-10-03 10:58 ` [PATCH 1/2 net-next] mlxsw: spectrum: Fix check for IS_ERR() instead of NULL Yotam Gigi
@ 2017-10-03 17:27 ` David Miller
2 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2017-10-03 17:27 UTC (permalink / raw)
To: dan.carpenter; +Cc: jiri, yotamg, idosch, netdev, kernel-janitors
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Tue, 3 Oct 2017 13:53:03 +0300
> mlxsw_afa_block_create() doesn't return error pointers, it returns NULL
> on error.
>
> Fixes: 0e14c7777acb ("mlxsw: spectrum: Add the multicast routing hardware logic")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Applied.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-10-03 17:27 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-03 10:53 [PATCH 1/2 net-next] mlxsw: spectrum: Fix check for IS_ERR() instead of NULL Dan Carpenter
2017-10-03 10:53 ` [PATCH 2/2 net-next] mlxsw: spectrum: Add missing error code on allocation failure Dan Carpenter
2017-10-03 10:56 ` Yotam Gigi
2017-10-03 17:27 ` David Miller
2017-10-03 10:58 ` [PATCH 1/2 net-next] mlxsw: spectrum: Fix check for IS_ERR() instead of NULL Yotam Gigi
2017-10-03 17:27 ` David Miller
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).