staging: rdma: use kmalloc_array instead of kmalloc

Use kmalloc_array instead of kmalloc to allocate memory for an array.

Signed-off-by: Geliang Tang <geliangtang@163.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rdma/amso1100/c2.c b/drivers/staging/rdma/amso1100/c2.c
index af043f023c7d0d4ef03ef85376b125d0bb79ef27..b46ebd1ae15a77106b5d0a5db4dde594ea39381d 100644 (file)
--- a/drivers/staging/rdma/amso1100/c2.c
+++ b/drivers/staging/rdma/amso1100/c2.c
@@ -111,7 +111,8 @@ static int c2_tx_ring_alloc(struct c2_ring *tx_ring, void *vaddr,
        struct c2_element *elem;
        int i;
 
-       tx_ring->start = kmalloc(sizeof(*elem) * tx_ring->count, GFP_KERNEL);
+       tx_ring->start = kmalloc_array(tx_ring->count, sizeof(*elem),
+                                      GFP_KERNEL);
        if (!tx_ring->start)
                return -ENOMEM;
 
@@ -160,7 +161,8 @@ static int c2_rx_ring_alloc(struct c2_ring *rx_ring, void *vaddr,
        struct c2_element *elem;
        int i;
 
-       rx_ring->start = kmalloc(sizeof(*elem) * rx_ring->count, GFP_KERNEL);
+       rx_ring->start = kmalloc_array(rx_ring->count, sizeof(*elem),
+                                      GFP_KERNEL);
        if (!rx_ring->start)
                return -ENOMEM;
 

diff --git a/drivers/staging/rdma/ipath/ipath_file_ops.c b/drivers/staging/rdma/ipath/ipath_file_ops.c
index 13c3cd11ab92a5c610ef7a5e32795a0b0a0931c9..6187b848b3ca5051879d5ef57a38f13230c3eb78 100644 (file)
--- a/drivers/staging/rdma/ipath/ipath_file_ops.c
+++ b/drivers/staging/rdma/ipath/ipath_file_ops.c
@@ -917,15 +917,15 @@ static int ipath_create_user_egr(struct ipath_portdata *pd)
        chunk = pd->port_rcvegrbuf_chunks;
        egrperchunk = pd->port_rcvegrbufs_perchunk;
        size = pd->port_rcvegrbuf_size;
-       pd->port_rcvegrbuf = kmalloc(chunk * sizeof(pd->port_rcvegrbuf[0]),
-                                    GFP_KERNEL);
+       pd->port_rcvegrbuf = kmalloc_array(chunk, sizeof(pd->port_rcvegrbuf[0]),
+                                          GFP_KERNEL);
        if (!pd->port_rcvegrbuf) {
                ret = -ENOMEM;
                goto bail;
        }
        pd->port_rcvegrbuf_phys =
-               kmalloc(chunk * sizeof(pd->port_rcvegrbuf_phys[0]),
-                       GFP_KERNEL);
+               kmalloc_array(chunk, sizeof(pd->port_rcvegrbuf_phys[0]),
+                             GFP_KERNEL);
        if (!pd->port_rcvegrbuf_phys) {
                ret = -ENOMEM;
                goto bail_rcvegrbuf;