]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ATM-ForeRunnerHE: Use kmalloc_array() in he_init_group()
authorMarkus Elfring <elfring@users.sourceforge.net>
Thu, 8 Sep 2016 13:43:37 +0000 (15:43 +0200)
committerDavid S. Miller <davem@davemloft.net>
Sat, 10 Sep 2016 02:27:32 +0000 (19:27 -0700)
* Multiplications for the size determination of memory allocations
  indicated that array data structures should be processed.
  Thus use the corresponding function "kmalloc_array".

  This issue was detected by using the Coccinelle software.

* Replace the specification of data types by pointer dereferences
  to make the corresponding size determination a bit safer according to
  the Linux coding style convention.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/atm/he.c

index 0f5cb37636bcc16b4e1ba23a58b30be4bba82b8f..31b513a23ae0cd1d39af043408deba0bbb8c9b83 100644 (file)
@@ -779,8 +779,9 @@ static int he_init_group(struct he_dev *he_dev, int group)
                  G0_RBPS_BS + (group * 32));
 
        /* bitmap table */
-       he_dev->rbpl_table = kmalloc(BITS_TO_LONGS(RBPL_TABLE_SIZE)
-                                    * sizeof(unsigned long), GFP_KERNEL);
+       he_dev->rbpl_table = kmalloc_array(BITS_TO_LONGS(RBPL_TABLE_SIZE),
+                                          sizeof(*he_dev->rbpl_table),
+                                          GFP_KERNEL);
        if (!he_dev->rbpl_table) {
                hprintk("unable to allocate rbpl bitmap table\n");
                return -ENOMEM;
@@ -788,8 +789,9 @@ static int he_init_group(struct he_dev *he_dev, int group)
        bitmap_zero(he_dev->rbpl_table, RBPL_TABLE_SIZE);
 
        /* rbpl_virt 64-bit pointers */
-       he_dev->rbpl_virt = kmalloc(RBPL_TABLE_SIZE
-                                   * sizeof(struct he_buff *), GFP_KERNEL);
+       he_dev->rbpl_virt = kmalloc_array(RBPL_TABLE_SIZE,
+                                         sizeof(*he_dev->rbpl_virt),
+                                         GFP_KERNEL);
        if (!he_dev->rbpl_virt) {
                hprintk("unable to allocate rbpl virt table\n");
                goto out_free_rbpl_table;