Commit 88a25a5f authored Sep 11, 2016 by Markus Elfring Committed by Ilya Dryomov Oct 03, 2016

rbd: use kmalloc_array() in rbd_header_from_disk()



* A multiplication for the size determination of a memory allocation
  indicated that an array data structure should be processed.
  Thus use the corresponding function "kmalloc_array".

  This issue was detected by using the Coccinelle software.

* Delete the local variable "size" which became unnecessary with
  this refactoring.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

parent 8cdcc07d

drivers/block/rbd.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -986,7 +986,6 @@ static int rbd_header_from_disk(struct rbd_device *rbd_dev,
		char *snap_names = NULL;
		u64 *snap_sizes = NULL;
		u32 snap_count;
		size_t size;
		int ret = -ENOMEM;
		u32 i;

		@@ -1024,9 +1023,9 @@ static int rbd_header_from_disk(struct rbd_device *rbd_dev,
		goto out_err;

		/* ...as well as the array of their sizes. */

		size = snap_count * sizeof (*header->snap_sizes);
		snap_sizes = kmalloc(size, GFP_KERNEL);
		snap_sizes = kmalloc_array(snap_count,
		sizeof(*header->snap_sizes),
		GFP_KERNEL);
		if (!snap_sizes)
		goto out_err;