Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1724423 > unrolled thread

[PATCH][next] net/mlx4_core: fix incorrect size allocation for dev->caps.spec_qps

Started byColin King <colin.king@canonical.com>
First post2017-08-31 19:10 +0200
Last post2017-09-03 20:00 +0200
Articles 2 — 2 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH][next] net/mlx4_core: fix incorrect size allocation for dev->caps.spec_qps Colin King <colin.king@canonical.com> - 2017-08-31 19:10 +0200
    Re: [PATCH][next] net/mlx4_core: fix incorrect size allocation for  dev->caps.spec_qps David Miller <davem@davemloft.net> - 2017-09-03 20:00 +0200

#1724423 — [PATCH][next] net/mlx4_core: fix incorrect size allocation for dev->caps.spec_qps

FromColin King <colin.king@canonical.com>
Date2017-08-31 19:10 +0200
Subject[PATCH][next] net/mlx4_core: fix incorrect size allocation for dev->caps.spec_qps
Message-ID<ukB8B-8op-5@gated-at.bofh.it>
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;
-- 
2.14.1

[toc] | [next] | [standalone]


#1725717 — Re: [PATCH][next] net/mlx4_core: fix incorrect size allocation for dev->caps.spec_qps

FromDavid Miller <davem@davemloft.net>
Date2017-09-03 20:00 +0200
SubjectRe: [PATCH][next] net/mlx4_core: fix incorrect size allocation for dev->caps.spec_qps
Message-ID<ulHlD-2X6-1@gated-at.bofh.it>
In reply to#1724423
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.

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web