mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] thunderbolt: Use kcalloc
@ 2014-07-11 19:42 Himangi Saraogi
  2014-07-12  7:17 ` Andreas Noever
  0 siblings, 1 reply; 2+ messages in thread
From: Himangi Saraogi @ 2014-07-11 19:42 UTC (permalink / raw)
  To: linux-kernel, Andreas Noever; +Cc: julia.lawall

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.

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
---
A patch on top of my char-misc tree as the kzalloc version is
already applied there.

 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 ce72f31..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(*nhi->tx_rings),
-				     GFP_KERNEL);
-	nhi->rx_rings = devm_kzalloc(&pdev->dev,
-				     nhi->hop_count * sizeof(*nhi->rx_rings),
-				     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


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] thunderbolt: Use kcalloc
  2014-07-11 19:42 [PATCH] thunderbolt: Use kcalloc Himangi Saraogi
@ 2014-07-12  7:17 ` Andreas Noever
  0 siblings, 0 replies; 2+ messages in thread
From: Andreas Noever @ 2014-07-12  7:17 UTC (permalink / raw)
  To: Himangi Saraogi, Greg Kroah-Hartman; +Cc: linux-kernel, julia.lawall

On Fri, Jul 11, 2014 at 9:42 PM, Himangi Saraogi <himangi774@gmail.com> wrote:
> 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.
>
> Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
> Acked-by: Julia Lawall <julia.lawall@lip6.fr>
> ---
> A patch on top of my char-misc tree as the kzalloc version is
> already applied there.
>
>  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 ce72f31..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(*nhi->tx_rings),
> -                                    GFP_KERNEL);
> -       nhi->rx_rings = devm_kzalloc(&pdev->dev,
> -                                    nhi->hop_count * sizeof(*nhi->rx_rings),
> -                                    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
>
+Greg

Acked-by: Andreas Noever <andreas.noever@gmail.com>

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-07-12  7:17 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-07-11 19:42 [PATCH] thunderbolt: Use kcalloc Himangi Saraogi
2014-07-12  7:17 ` Andreas Noever

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®