tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
slub: ksize() abuse checks
slob: Fix to return wrong pointer

Linus Torvalds 1434b657 4934ed88

+6 -4
+3 -2
mm/slob.c
··· 469 469 return ZERO_SIZE_PTR; 470 470 471 471 m = slob_alloc(size + align, gfp, align, node); 472 - if (m) 473 - *m = size; 472 + if (!m) 473 + return NULL; 474 + *m = size; 474 475 return (void *)m + align; 475 476 } else { 476 477 void *ret;
+3 -2
mm/slub.c
··· 2726 2726 2727 2727 page = virt_to_head_page(object); 2728 2728 2729 - if (unlikely(!PageSlab(page))) 2729 + if (unlikely(!PageSlab(page))) { 2730 + WARN_ON(!PageCompound(page)); 2730 2731 return PAGE_SIZE << compound_order(page); 2731 - 2732 + } 2732 2733 s = page->slab; 2733 2734 2734 2735 #ifdef CONFIG_SLUB_DEBUG