Commit 54e02162 authored by Jason Wang's avatar Jason Wang Committed by David S. Miller

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: default avatarEric Biggers <ebiggers3@gmail.com>
Fixes: 6e6e41c3 ("ptr_ring: fail early if queue occupies more than KMALLOC_MAX_SIZE")
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7928b2cb
...@@ -469,7 +469,7 @@ static inline int ptr_ring_consume_batched_bh(struct ptr_ring *r, ...@@ -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) 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 NULL;
return kvmalloc_array(size, sizeof(void *), gfp | __GFP_ZERO); return kvmalloc_array(size, sizeof(void *), gfp | __GFP_ZERO);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment