2014-07-11 19:42:53

by Himangi Saraogi

Subject: [PATCH] thunderbolt: Use kcalloc

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 <[email protected]>
Acked-by: Julia Lawall <[email protected]>
---
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

2014-07-12 07:17:49

by Andreas Noever

Subject: Re: [PATCH] thunderbolt: Use kcalloc

On Fri, Jul 11, 2014 at 9:42 PM, Himangi Saraogi <[email protected]> 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 <[email protected]>
> Acked-by: Julia Lawall <[email protected]>
> ---
> 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 <[email protected]>