diff options
| author | Alexander Potapenko <glider@google.com> | 2019-07-16 16:27:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-16 19:23:22 -0700 |
| commit | 4ab7ace465466d25c12cee9854e7140077e208cb (patch) | |
| tree | ebd221f79fcff07301b015dc5a8d6895997c724f /lib | |
| parent | d3a811617ae629d7c0c5b7f0b7b0a72715ae3407 (diff) | |
| download | blackbird-op-linux-4ab7ace465466d25c12cee9854e7140077e208cb.tar.gz blackbird-op-linux-4ab7ace465466d25c12cee9854e7140077e208cb.zip | |
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.
Link: http://lkml.kernel.org/r/20190626133135.217355-1-glider@google.com
Fixes: 7e659650cbda ("lib: introduce test_meminit module")
Fixes: 94e8988d91c7 ("lib/test_meminit.c: fix -Wmaybe-uninitialized false positive")
Signed-off-by: Alexander Potapenko <glider@google.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Kees Cook <keescook@chromium.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/test_meminit.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/test_meminit.c b/lib/test_meminit.c index 7ae2183ff1f4..62d19f270cad 100644 --- a/lib/test_meminit.c +++ b/lib/test_meminit.c @@ -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 |
