diff options
| author | Vegard Nossum <vegard.nossum@gmail.com> | 2007-12-04 23:45:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-05 09:21:20 -0800 |
| commit | 294a80a8ed004b383ab214837e1c05ca4098a717 (patch) | |
| tree | 2cbf9d33ccafa5042dbde85641d4ca27dcf47dc5 /mm | |
| parent | 5a622f2d0f86b316b07b55a4866ecb5518dd1cf7 (diff) | |
| download | linux-294a80a8ed004b383ab214837e1c05ca4098a717.tar.gz linux-294a80a8ed004b383ab214837e1c05ca4098a717.tar.bz2 linux-294a80a8ed004b383ab214837e1c05ca4098a717.zip | |
SLUB's ksize() fails for size > 2048
I can't pass memory allocated by kmalloc() to ksize() if it is allocated by
SLUB allocator and size is larger than (I guess) PAGE_SIZE / 2.
The error of ksize() seems to be that it does not check if the allocation
was made by SLUB or the page allocator.
Reviewed-by: Pekka Enberg <penberg@cs.helsinki.fi>
Tested-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Cc: Christoph Lameter <clameter@sgi.com>, Matt Mackall <mpm@selenic.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/slub.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mm/slub.c b/mm/slub.c index 9acb413858ac..b9f37cb0f2e6 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -2558,8 +2558,12 @@ size_t ksize(const void *object) if (unlikely(object == ZERO_SIZE_PTR)) return 0; - page = get_object_page(object); + page = virt_to_head_page(object); BUG_ON(!page); + + if (unlikely(!PageSlab(page))) + return PAGE_SIZE << compound_order(page); + s = page->slab; BUG_ON(!s); |