Skip to content

Commit 771f8bc

Browse files
committed
Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
* 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6: slub: Fix a crash during slabinfo -v
2 parents 31c67c7 + 37d5744 commit 771f8bc

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

mm/slub.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3401,13 +3401,13 @@ static int validate_slab(struct kmem_cache *s, struct page *page,
34013401

34023402
for_each_free_object(p, s, page->freelist) {
34033403
set_bit(slab_index(p, s, addr), map);
3404-
if (!check_object(s, page, p, 0))
3404+
if (!check_object(s, page, p, SLUB_RED_INACTIVE))
34053405
return 0;
34063406
}
34073407

34083408
for_each_object(p, s, addr, page->objects)
34093409
if (!test_bit(slab_index(p, s, addr), map))
3410-
if (!check_object(s, page, p, 1))
3410+
if (!check_object(s, page, p, SLUB_RED_ACTIVE))
34113411
return 0;
34123412
return 1;
34133413
}

0 commit comments

Comments
 (0)