Skip to contentSkip to conversation

lib/test_meminit.c: minor test fixes

PATCH New Alexander Potapenko 1 participant 1 message Jun 26, 2019

Subsystems (2)
Memory management Library code
lore
Share & tools
lore

Alexander Potapenko

author
#0 lore raw

PATCH 1/1 lib/test_meminit.c: minor test fixes

Fix the following issues in test_meminit.c:
- |size| in fill_with_garbage_skip() should be signed so that it doesn't overflow if it's not aligned on sizeof(*p);
- fill_with_garbage_skip() should actually skip |skip| bytes;
- do_kmem_cache_size() should deallocate memory in the RCU case.

Fixes 7e659650cbda ("lib: introduce test_meminit module")
Fixes 94e8988d91c7 ("lib/test_meminit.c: fix -Wmaybe-uninitialized false positive")
Signed-off-by Alexander Potapenko <[email protected]>
Cc Arnd Bergmann <[email protected]>
Cc Kees Cook <[email protected]>
Cc Andrew Morton <[email protected]>
Cc [email protected]

---

This patch is relative to the -mm tree

---
 lib/test_meminit.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
lib/test_meminit.c +6 -6
index 7ae2183ff1f4..62d19f270cad 100644
@@ -38,15 +38,14 @@ static int __init count_nonzero_bytes(void *ptr, size_t size)
 }
 
 /* Fill a buffer with garbage, skipping |skip| first bytes. */
-static void __init fill_with_garbage_skip(void *ptr, size_t size, size_t skip)
+static void __init fill_with_garbage_skip(void *ptr, int size, size_t skip)
 {
-	unsigned int *p = (unsigned int *)ptr;
+	unsigned int *p = (unsigned int *)((char *)ptr + skip);
 	int i = 0;
 
-	if (skip) {
-		WARN_ON(skip > size);
-		p += skip;
-	}
+	WARN_ON(skip > size);
+	size -= skip;
+
 	while (size >= sizeof(*p)) {
 		p[i] = GARBAGE_INT;
 		i++;

@@ -227,6 +226,7 @@ static int __init do_kmem_cache_size(size_t size, bool want_ctor,
 		if (buf_copy)
 			memcpy(buf_copy, buf, size);
 
+		kmem_cache_free(c, buf);
 		/*
 		 * Check that |buf| is intact after kmem_cache_free().
 		 * |want_zero| is false, because we wrote garbage to
Signature · 1 line
2.22.0.410.gd8fdbe21b5-goog