drbd: switch from kmalloc() to kmalloc_array()

We had one call to kmalloc that actually allocates an array. Switch that
one to the kmalloc_array() function.

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index 4e8a543ded705b73d4a88ab38917da98a613166b..796eaf347dc096fb8e56b860c1b530c9cf9da8a2 100644 (file)
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -4126,7 +4126,7 @@ static int receive_uuids(struct drbd_connection *connection, struct packet_info
                return config_unknown_volume(connection, pi);
        device = peer_device->device;
 
-       p_uuid = kmalloc(sizeof(u64)*UI_EXTENDED_SIZE, GFP_NOIO);
+       p_uuid = kmalloc_array(UI_EXTENDED_SIZE, sizeof(*p_uuid), GFP_NOIO);
        if (!p_uuid) {
                drbd_err(device, "kmalloc of p_uuid failed\n");
                return false;

diff --git a/include/linux/drbd.h b/include/linux/drbd.h
index 002611c85318f53365f6a606b4d37e445e40f9b6..2d0259327721444b587e6ec6bd8388a01afc82db 100644 (file)
--- a/include/linux/drbd.h
+++ b/include/linux/drbd.h
@@ -51,7 +51,7 @@
 #endif
 
 extern const char *drbd_buildtag(void);
-#define REL_VERSION "8.4.7"
+#define REL_VERSION "8.4.10"
 #define API_VERSION 1
 #define PRO_VERSION_MIN 86
 #define PRO_VERSION_MAX 101