mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-25 02:09:42 +00:00
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
This commit is contained in:
commit
771f8bc71c
1 changed files with 2 additions and 2 deletions
|
@ -3401,13 +3401,13 @@ static int validate_slab(struct kmem_cache *s, struct page *page,
|
|||
|
||||
for_each_free_object(p, s, page->freelist) {
|
||||
set_bit(slab_index(p, s, addr), map);
|
||||
if (!check_object(s, page, p, 0))
|
||||
if (!check_object(s, page, p, SLUB_RED_INACTIVE))
|
||||
return 0;
|
||||
}
|
||||
|
||||
for_each_object(p, s, addr, page->objects)
|
||||
if (!test_bit(slab_index(p, s, addr), map))
|
||||
if (!check_object(s, page, p, 1))
|
||||
if (!check_object(s, page, p, SLUB_RED_ACTIVE))
|
||||
return 0;
|
||||
return 1;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue