lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* '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
This commit is contained in:
Linus Torvalds
2008-05-26 10:21:26 -07:00
parent 4934ed888e 76994412f8
commit 1434b65731
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mm/slob.c
View File

@@ -469,8 +469,9 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
return ZERO_SIZE_PTR; return ZERO_SIZE_PTR;
m = slob_alloc(size + align, gfp, align, node); m = slob_alloc(size + align, gfp, align, node);
if (m) if (!m)
*m = size; return NULL;
*m = size;
return (void *)m + align; return (void *)m + align;
} else { } else {
void *ret; void *ret;

5
mm/slub.c
View File

@@ -2726,9 +2726,10 @@ size_t ksize(const void *object)
page = virt_to_head_page(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); return PAGE_SIZE << compound_order(page);
}
s = page->slab; s = page->slab;
#ifdef CONFIG_SLUB_DEBUG #ifdef CONFIG_SLUB_DEBUG