slob: Fix to return wrong pointer
Although slob_alloc return NULL, __kmalloc_node returns NULL + align. Because align always can be changed, it is very hard for debugging problem of no page if it don't return NULL. We have to return NULL in case of no page. [penberg@cs.helsinki.fi: fix formatting as suggested by Matt.] Acked-by: Matt Mackall <mpm@selenic.com> Signed-off-by: MinChan Kim <minchan.kim@gmail.com> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
This commit is contained in:
parent
f26a398891
commit
239f49c080
1 changed files with 3 additions and 2 deletions
|
@ -469,8 +469,9 @@ 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)
|
||||
*m = size;
|
||||
if (!m)
|
||||
return NULL;
|
||||
*m = size;
|
||||
return (void *)m + align;
|
||||
} else {
|
||||
void *ret;
|
||||
|
|
Loading…
Add table
Reference in a new issue