From: Himangi Saraogi <himangi774@gmail.com>
To: Andreas Noever <andreas.noever@gmail.com>, linux-kernel@vger.kernel.org
Cc: julia.lawall@lip6.fr
Subject: [PATCH v3] thunderbolt: Use kcalloc and correct the argument to sizeof
Date: Wed, 9 Jul 2014 04:01:26 +0530 [thread overview]
Message-ID: <20140708223126.GA12035@himangi-Dell> (raw)
nhi->rx_rings does not have type as struct tb_ring *, as it is a double
pointer. So, the elements of the array should have pointer type, not
structure type. The advantage of kcalloc is, that will prevent integer
overflows which could result from the multiplication of number of
elements and size and it is also a bit nicer to read.
The Coccinelle semantic patch that makes the first change is as follows:
// <smpl>
@disable sizeof_type_expr@
type T;
T **x;
@@
x =
<+...sizeof(
- T
+ *x
)...+>
// </smpl>
Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
---
v2: Use kcalloc
v3: Add maintainer in To
drivers/thunderbolt/nhi.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/thunderbolt/nhi.c b/drivers/thunderbolt/nhi.c
index 2054fbf..c68fe12 100644
--- a/drivers/thunderbolt/nhi.c
+++ b/drivers/thunderbolt/nhi.c
@@ -569,12 +569,10 @@ static int nhi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
nhi->hop_count);
INIT_WORK(&nhi->interrupt_work, nhi_interrupt_work);
- nhi->tx_rings = devm_kzalloc(&pdev->dev,
- nhi->hop_count * sizeof(struct tb_ring),
- GFP_KERNEL);
- nhi->rx_rings = devm_kzalloc(&pdev->dev,
- nhi->hop_count * sizeof(struct tb_ring),
- GFP_KERNEL);
+ nhi->tx_rings = devm_kcalloc(&pdev->dev, nhi->hop_count,
+ sizeof(*nhi->tx_rings), GFP_KERNEL);
+ nhi->rx_rings = devm_kcalloc(&pdev->dev, nhi->hop_count,
+ sizeof(*nhi->rx_rings), GFP_KERNEL);
if (!nhi->tx_rings || !nhi->rx_rings)
return -ENOMEM;
--
1.9.1
next reply other threads:[~2014-07-08 22:31 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-08 22:31 Himangi Saraogi [this message]
2014-07-10 16:45 ` [PATCH v3] thunderbolt: Use kcalloc and correct the argument to sizeof Andreas Noever
2014-07-11 17:14 ` Andreas Noever
2014-07-11 18:13 ` Greg Kroah-Hartman
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=20140708223126.GA12035@himangi-Dell \
--to=himangi774@gmail.com \
--cc=andreas.noever@gmail.com \
--cc=julia.lawall@lip6.fr \
--cc=linux-kernel@vger.kernel.org \
/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