Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1319274

[PATCH v1 1/8] kasan: Change the behavior of kmalloc_large_oob_right test

Show all headers | View raw

depending on which allocator (SLAB or SLUB) is being used

Signed-off-by: Alexander Potapenko <glider@google.com>
---
 lib/test_kasan.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/lib/test_kasan.c b/lib/test_kasan.c
index c32f3b0..66dd92f 100644
--- a/lib/test_kasan.c
+++ b/lib/test_kasan.c
@@ -68,7 +68,22 @@ static noinline void __init kmalloc_node_oob_right(void)
 static noinline void __init kmalloc_large_oob_right(void)
 {
 	char *ptr;
-	size_t size = KMALLOC_MAX_CACHE_SIZE + 10;
+	size_t size;
+
+	if (KMALLOC_MAX_CACHE_SIZE == KMALLOC_MAX_SIZE) {
+		/*
+		 * We're using the SLAB allocator. Allocate a chunk that fits
+		 * into a slab.
+		 */
+		size = KMALLOC_MAX_CACHE_SIZE - 256;
+	} else {
+		/*
+		 * KMALLOC_MAX_SIZE > KMALLOC_MAX_CACHE_SIZE.
+		 * We're using the SLUB allocator. Allocate a chunk that does
+		 * not fit into a slab to trigger the page allocator.
+		 */
+		size = KMALLOC_MAX_CACHE_SIZE + 10;
+	}
 
 	pr_info("kmalloc large allocation: out-of-bounds to right\n");
 	ptr = kmalloc(size, GFP_KERNEL);
-- 
2.7.0.rc3.207.g0ac5344

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH v1 0/8] SLAB support for KASAN Alexander Potapenko <glider@google.com> - 2016-01-27 19:30 +0100
  [PATCH v1 2/8] mm, kasan: SLAB support Alexander Potapenko <glider@google.com> - 2016-01-27 19:30 +0100
  [PATCH v1 6/8] kasan: Test fix: Warn if the UAF could not be detected in kmalloc_uaf2 Alexander Potapenko <glider@google.com> - 2016-01-27 19:30 +0100
  [PATCH v1 8/8] mm: kasan: Initial memory quarantine implementation Alexander Potapenko <glider@google.com> - 2016-01-27 19:30 +0100
  [PATCH v1 5/8] mm, kasan: Stackdepot implementation. Enable stackdepot for SLAB Alexander Potapenko <glider@google.com> - 2016-01-27 19:30 +0100
  [PATCH v1 3/8] mm, kasan: Added GFP flags to KASAN API Alexander Potapenko <glider@google.com> - 2016-01-27 19:30 +0100
  [PATCH v1 1/8] kasan: Change the behavior of kmalloc_large_oob_right test Alexander Potapenko <glider@google.com> - 2016-01-27 19:30 +0100

csiph-web