]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
ptr_ring: fail early if queue occupies more than KMALLOC_MAX_SIZE
authorJason Wang <jasowang@redhat.com>
Fri, 9 Feb 2018 09:45:49 +0000 (17:45 +0800)
committerSeth Forshee <seth.forshee@canonical.com>
Wed, 28 Feb 2018 14:46:31 +0000 (08:46 -0600)
BugLink: http://bugs.launchpad.net/bugs/1752119
commit 6e6e41c3112276288ccaf80c70916779b84bb276 upstream.

To avoid slab to warn about exceeded size, fail early if queue
occupies more than KMALLOC_MAX_SIZE.

Reported-by: syzbot+e4d4f9ddd4295539735d@syzkaller.appspotmail.com
Fixes: 2e0ab8ca83c12 ("ptr_ring: array based FIFO for pointers")
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
include/linux/ptr_ring.h

index d72b2e7dd500ea5224a3afa330f478b3475e0a4e..198cf07a7ee742dbfa4c444d4ca853ca8c049251 100644 (file)
@@ -453,6 +453,8 @@ 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)
+               return NULL;
        return kcalloc(size, sizeof(void *), gfp);
 }