From: Andrew Morton Diddle whitespace Cc: Christoph Lameter Signed-off-by: Andrew Morton --- mm/slub.c | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-) diff -puN mm/slub.c~slub-core-tidy-3 mm/slub.c --- a/mm/slub.c~slub-core-tidy-3 +++ a/mm/slub.c @@ -462,14 +462,14 @@ static int check_object(struct kmem_cach "Redzone Inactive check fails"); return 0; } - } else - if ((s->flags & SLAB_POISON) && s->objsize < s->inuse && - !check_bytes(endobject, POISON_INUSE, s->inuse - s->objsize)) + } else if ((s->flags & SLAB_POISON) && s->objsize < s->inuse && + !check_bytes(endobject, POISON_INUSE, + s->inuse - s->objsize)) object_err(s, page, p, "Alignment padding check fails"); if (s->flags & SLAB_POISON) { - if (!active && (s->flags & __OBJECT_POISON) - && (!check_bytes(p, POISON_FREE, s->objsize - 1) || + if (!active && (s->flags & __OBJECT_POISON) && + (!check_bytes(p, POISON_FREE, s->objsize - 1) || p[s->objsize -1] != POISON_END)) { object_err(s, page, p, "Poison check failed"); return 0; @@ -487,14 +487,14 @@ static int check_object(struct kmem_cach /* Check free pointer validity */ if (!check_valid_pointer(s, page, get_freepointer(s, p))) { - object_err(s, page, p, "Freepointer corrupt"); - /* - * No choice but to zap it. This may cause - * another error because the object count - * is now wrong. - */ - set_freepointer(s, p, NULL); - return 0; + object_err(s, page, p, "Freepointer corrupt"); + /* + * No choice but to zap it. This may cause + * another error because the object count + * is now wrong. + */ + set_freepointer(s, p, NULL); + return 0; } return 1; } @@ -619,9 +619,8 @@ bad: static int free_object_checks(struct kmem_cache *s, struct page *page, void *object) { - if (!check_slab(s, page)) { + if (!check_slab(s, page)) goto fail; - } if (!check_valid_pointer(s, page, object)) { printk(KERN_ERR "SLUB: %s slab 0x%p invalid " _