diff options
| author |   Jason Wang <jasowang@redhat.com> | 2018-02-11 11:28:12 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-02-11 22:33:22 -0500 |
| commit | 54e02162d4454a99227f520948bf4494c3d972d0 (patch) | |
| tree | 47f1ac2164f0f61abb6e55ff4e8f9142ac6e2ba1 /include/linux/ptr_ring.h | |
| parent | Linux 4.16-rc1 (diff) | |
| download | linux-dev-54e02162d4454a99227f520948bf4494c3d972d0.tar.xz linux-dev-54e02162d4454a99227f520948bf4494c3d972d0.zip | |
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>
Diffstat (limited to 'include/linux/ptr_ring.h')
| -rw-r--r-- | include/linux/ptr_ring.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ptr_ring.h b/include/linux/ptr_ring.h index b884b7794187..e6335227b844 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); } |