Commit a016471a authored by David Rientjes's avatar David Rientjes Committed by Pekka Enberg

slub: fix SLUB_RESILIENCY_TEST for dynamic kmalloc caches

Now that the kmalloc_caches array is dynamically allocated at boot,
SLUB_RESILIENCY_TEST needs to be fixed to pass the correct type.
Acked-by: default avatarChristoph Lameter <cl@linux.com>
Signed-off-by: default avatarDavid Rientjes <rientjes@google.com>
Signed-off-by: default avatarPekka Enberg <penberg@kernel.org>
parent 8de66a0c
...@@ -3498,6 +3498,8 @@ static void resiliency_test(void) ...@@ -3498,6 +3498,8 @@ static void resiliency_test(void)
{ {
u8 *p; u8 *p;
BUILD_BUG_ON(KMALLOC_MIN_SIZE > 16 || SLUB_PAGE_SHIFT < 10);
printk(KERN_ERR "SLUB resiliency testing\n"); printk(KERN_ERR "SLUB resiliency testing\n");
printk(KERN_ERR "-----------------------\n"); printk(KERN_ERR "-----------------------\n");
printk(KERN_ERR "A. Corruption after allocation\n"); printk(KERN_ERR "A. Corruption after allocation\n");
...@@ -3507,7 +3509,7 @@ static void resiliency_test(void) ...@@ -3507,7 +3509,7 @@ static void resiliency_test(void)
printk(KERN_ERR "\n1. kmalloc-16: Clobber Redzone/next pointer" printk(KERN_ERR "\n1. kmalloc-16: Clobber Redzone/next pointer"
" 0x12->0x%p\n\n", p + 16); " 0x12->0x%p\n\n", p + 16);
validate_slab_cache(kmalloc_caches + 4); validate_slab_cache(kmalloc_caches[4]);
/* Hmmm... The next two are dangerous */ /* Hmmm... The next two are dangerous */
p = kzalloc(32, GFP_KERNEL); p = kzalloc(32, GFP_KERNEL);
...@@ -3517,7 +3519,7 @@ static void resiliency_test(void) ...@@ -3517,7 +3519,7 @@ static void resiliency_test(void)
printk(KERN_ERR printk(KERN_ERR
"If allocated object is overwritten then not detectable\n\n"); "If allocated object is overwritten then not detectable\n\n");
validate_slab_cache(kmalloc_caches + 5); validate_slab_cache(kmalloc_caches[5]);
p = kzalloc(64, GFP_KERNEL); p = kzalloc(64, GFP_KERNEL);
p += 64 + (get_cycles() & 0xff) * sizeof(void *); p += 64 + (get_cycles() & 0xff) * sizeof(void *);
*p = 0x56; *p = 0x56;
...@@ -3525,27 +3527,27 @@ static void resiliency_test(void) ...@@ -3525,27 +3527,27 @@ static void resiliency_test(void)
p); p);
printk(KERN_ERR printk(KERN_ERR
"If allocated object is overwritten then not detectable\n\n"); "If allocated object is overwritten then not detectable\n\n");
validate_slab_cache(kmalloc_caches + 6); validate_slab_cache(kmalloc_caches[6]);
printk(KERN_ERR "\nB. Corruption after free\n"); printk(KERN_ERR "\nB. Corruption after free\n");
p = kzalloc(128, GFP_KERNEL); p = kzalloc(128, GFP_KERNEL);
kfree(p); kfree(p);
*p = 0x78; *p = 0x78;
printk(KERN_ERR "1. kmalloc-128: Clobber first word 0x78->0x%p\n\n", p); printk(KERN_ERR "1. kmalloc-128: Clobber first word 0x78->0x%p\n\n", p);
validate_slab_cache(kmalloc_caches + 7); validate_slab_cache(kmalloc_caches[7]);
p = kzalloc(256, GFP_KERNEL); p = kzalloc(256, GFP_KERNEL);
kfree(p); kfree(p);
p[50] = 0x9a; p[50] = 0x9a;
printk(KERN_ERR "\n2. kmalloc-256: Clobber 50th byte 0x9a->0x%p\n\n", printk(KERN_ERR "\n2. kmalloc-256: Clobber 50th byte 0x9a->0x%p\n\n",
p); p);
validate_slab_cache(kmalloc_caches + 8); validate_slab_cache(kmalloc_caches[8]);
p = kzalloc(512, GFP_KERNEL); p = kzalloc(512, GFP_KERNEL);
kfree(p); kfree(p);
p[512] = 0xab; p[512] = 0xab;
printk(KERN_ERR "\n3. kmalloc-512: Clobber redzone 0xab->0x%p\n\n", p); printk(KERN_ERR "\n3. kmalloc-512: Clobber redzone 0xab->0x%p\n\n", p);
validate_slab_cache(kmalloc_caches + 9); validate_slab_cache(kmalloc_caches[9]);
} }
#else #else
static void resiliency_test(void) {}; static void resiliency_test(void) {};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment