| Message ID | 20170831170724.3747-1-colin.king@canonical.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On 31/08/2017 8:07 PM, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > The current allocation for dev->caps.spec_qps is for the size of the > pointer and not the size of the actual mlx4_spec_qps structure. Fix > this by using the correct size. Also splint allocation over a few > lines to make it cppcheck clean on overly wide lines. > > Detected by CoverityScan, CID#1455222 ("Wrong sizeof argument") > > Fixes: c73c8b1e47ca ("net/mlx4_core: Dynamically allocate structs at mlx4_slave_cap") > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > drivers/net/ethernet/mellanox/mlx4/qp.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/mellanox/mlx4/qp.c b/drivers/net/ethernet/mellanox/mlx4/qp.c > index b16fc441609e..728a2fb1f5c0 100644 > --- a/drivers/net/ethernet/mellanox/mlx4/qp.c > +++ b/drivers/net/ethernet/mellanox/mlx4/qp.c > @@ -845,8 +845,9 @@ int mlx4_init_qp_table(struct mlx4_dev *dev) > > /* In mfunc, calculate proxy and tunnel qp offsets for the PF here, > * since the PF does not call mlx4_slave_caps */ > - dev->caps.spec_qps = kcalloc(dev->caps.num_ports, sizeof(dev->caps.spec_qps), GFP_KERNEL); > - > + dev->caps.spec_qps = kcalloc(dev->caps.num_ports, > + sizeof(*dev->caps.spec_qps), > + GFP_KERNEL); > if (!dev->caps.spec_qps) { > err = -ENOMEM; > goto err_mem; > Acked-by: Tariq Toukan <tariqt@mellanox.com> Thanks! -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Colin King <colin.king@canonical.com> Date: Thu, 31 Aug 2017 18:07:24 +0100 > From: Colin Ian King <colin.king@canonical.com> > > The current allocation for dev->caps.spec_qps is for the size of the > pointer and not the size of the actual mlx4_spec_qps structure. Fix > this by using the correct size. Also splint allocation over a few > lines to make it cppcheck clean on overly wide lines. > > Detected by CoverityScan, CID#1455222 ("Wrong sizeof argument") > > Fixes: c73c8b1e47ca ("net/mlx4_core: Dynamically allocate structs at mlx4_slave_cap") > Signed-off-by: Colin Ian King <colin.king@canonical.com> Applied. -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/mellanox/mlx4/qp.c b/drivers/net/ethernet/mellanox/mlx4/qp.c index b16fc441609e..728a2fb1f5c0 100644 --- a/drivers/net/ethernet/mellanox/mlx4/qp.c +++ b/drivers/net/ethernet/mellanox/mlx4/qp.c @@ -845,8 +845,9 @@ int mlx4_init_qp_table(struct mlx4_dev *dev) /* In mfunc, calculate proxy and tunnel qp offsets for the PF here, * since the PF does not call mlx4_slave_caps */ - dev->caps.spec_qps = kcalloc(dev->caps.num_ports, sizeof(dev->caps.spec_qps), GFP_KERNEL); - + dev->caps.spec_qps = kcalloc(dev->caps.num_ports, + sizeof(*dev->caps.spec_qps), + GFP_KERNEL); if (!dev->caps.spec_qps) { err = -ENOMEM; goto err_mem;