Commit 1434b657 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 4934ed88 76994412

mm/slob.c

+3 −2
Original line number Diff line number Diff line
@@ -469,7 +469,8 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node) 
			return ZERO_SIZE_PTR;



		m = slob_alloc(size + align, gfp, align, node);

		if (m)

		if (!m)

			return NULL;

		*m = size;

		return (void *)m + align;

	} else {

mm/slub.c

+3 −2
Original line number Diff line number Diff line
@@ -2726,9 +2726,10 @@ size_t ksize(const void *object) 


	page = virt_to_head_page(object);



	if (unlikely(!PageSlab(page)))

	if (unlikely(!PageSlab(page))) {

		WARN_ON(!PageCompound(page));

		return PAGE_SIZE << compound_order(page);



	}

	s = page->slab;



#ifdef CONFIG_SLUB_DEBUG