Skip to contentSkip to conversation

Patch "ptr_ring: fail early if queue occupies more than KMALLOC_MAX_SIZE" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Feb 23, 2018 Stable branch

lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

ptr_ring: fail early if queue occupies more than KMALLOC_MAX_SIZE

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
ptr_ring-fail-early-if-queue-occupies-more-than-kmalloc_max_size.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 6e6e41c3112276288ccaf80c70916779b84bb276 Mon Sep 17 00:00:00 2001

From: Jason Wang <[email protected]>
Date: Fri, 9 Feb 2018 17:45:49 +0800
Subject: ptr_ring: fail early if queue occupies more than KMALLOC_MAX_SIZE

From: Jason Wang <[email protected]>

commit 6e6e41c3112276288ccaf80c70916779b84bb276 upstream.

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

Reported-by [email protected]
Fixes 2e0ab8ca83c12 ("ptr_ring: array based FIFO for pointers")
---
 include/linux/ptr_ring.h |    2 ++
 1 file changed, 2 insertions(+)
include/linux/ptr_ring.h +2 -0
@@ -351,6 +351,8 @@ static inline void *ptr_ring_consume_bh(
 
 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);
 }
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/vhost-use-mutex_lock_nested-in-vhost_dev_lock_vqs.patch queue-4.9/ptr_ring-fail-early-if-queue-occupies-more-than-kmalloc_max_size.patch