From: Jason Wang <jasowang@redhat.com>
Date: Sun, 11 Feb 2018 03:28:12 +0000 (+0800)
Subject: ptr_ring: prevent integer overflow when calculating size
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=54e02162d4454a99227f520948bf4494c3d972d0;p=linux.git

ptr_ring: prevent integer overflow when calculating size

Switch to use dividing to prevent integer overflow when size is too
big to calculate allocation size properly.

Reported-by: Eric Biggers <ebiggers3@gmail.com>
Fixes: 6e6e41c31122 ("ptr_ring: fail early if queue occupies more than KMALLOC_MAX_SIZE")
Signed-off-by: Jason Wang <jasowang@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/include/linux/ptr_ring.h b/include/linux/ptr_ring.h
index b884b7794187e..e6335227b8448 100644
--- a/include/linux/ptr_ring.h
+++ b/include/linux/ptr_ring.h
@@ -469,7 +469,7 @@ static inline int ptr_ring_consume_batched_bh(struct ptr_ring *r,
  */
 static inline void **__ptr_ring_init_queue_alloc(unsigned int size, gfp_t gfp)
 {
-	if (size * sizeof(void *) > KMALLOC_MAX_SIZE)
+	if (size > KMALLOC_MAX_SIZE / sizeof(void *))
 		return NULL;
 	return kvmalloc_array(size, sizeof(void *), gfp | __GFP_ZERO);
 }