powerpc/powernv/pci: Use kmalloc_array() in two functions
authorMarkus Elfring <elfring@users.sourceforge.net>
Wed, 24 Aug 2016 20:26:37 +0000 (22:26 +0200)
committerMichael Ellerman <mpe@ellerman.id.au>
Wed, 25 Jan 2017 02:34:19 +0000 (13:34 +1100)
Use kmalloc_array(), which checks for overflow of the multiplication,
rather than doing it by hand.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/platforms/powernv/pci-ioda.c

index b07680cd251820c6b38a41a878d7598d2a02b05b..939de0c2e00f11df967c0b4e7a09ac5754bdaabb 100644 (file)
@@ -1326,7 +1326,9 @@ static int pnv_pci_vf_assign_m64(struct pci_dev *pdev, u16 num_vfs)
        else
                m64_bars = 1;
 
-       pdn->m64_map = kmalloc(sizeof(*pdn->m64_map) * m64_bars, GFP_KERNEL);
+       pdn->m64_map = kmalloc_array(m64_bars,
+                                    sizeof(*pdn->m64_map),
+                                    GFP_KERNEL);
        if (!pdn->m64_map)
                return -ENOMEM;
        /* Initialize the m64_map to IODA_INVALID_M64 */
@@ -1593,8 +1595,9 @@ int pnv_pci_sriov_enable(struct pci_dev *pdev, u16 num_vfs)
 
                /* Allocating pe_num_map */
                if (pdn->m64_single_mode)
-                       pdn->pe_num_map = kmalloc(sizeof(*pdn->pe_num_map) * num_vfs,
-                                       GFP_KERNEL);
+                       pdn->pe_num_map = kmalloc_array(num_vfs,
+                                                       sizeof(*pdn->pe_num_map),
+                                                       GFP_KERNEL);
                else
                        pdn->pe_num_map = kmalloc(sizeof(*pdn->pe_num_map), GFP_KERNEL);