Skip to contentSkip to conversation

thunderbolt: Use kcalloc

PATCH In review Himangi Saraogi 2 participants 2 messages Jul 11, 2014 – Jul 12, 2014 Thunderbolt driver

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
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(-)
drivers/thunderbolt/nhi.c +4 -6
index ce72f31..c68fe12 100644
@@ -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;
 
Signature · 1 line
1.9.1
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 35 lines · Himangi Saraogi

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.

---
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(-)
drivers/thunderbolt/nhi.c +4 -7
index ce72f31..c68fe12 100644
@@ -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;
 
--
Quoted 2 lines

1.9.1

+Greg