| Message ID | 20171003105340.llwk5oajgrohbksu@mwanda |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [1/2,net-next] mlxsw: spectrum: Fix check for IS_ERR() instead of NULL | expand |
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++)
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.
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++)
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>