mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
memcg: null dereference on allocation failure
The original code had a null dereference if alloc_percpu() failed. This
was introduced in commit 711d3d2c9b ("memcg: cpu hotplug aware percpu
count updates")
Signed-off-by: Dan Carpenter <[email protected]>
Reviewed-by: Balbir Singh <[email protected]>
Acked-by: KAMEZAWA Hiroyuki <[email protected]>
Acked-by: Daisuke Nishimura <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
1093736b3c
commit
d2e61b8dc9
1 changed files with 9 additions and 7 deletions
|
|
@ -4208,15 +4208,17 @@ static struct mem_cgroup *mem_cgroup_alloc(void)
|
|||
|
||||
memset(mem, 0, size);
|
||||
mem->stat = alloc_percpu(struct mem_cgroup_stat_cpu);
|
||||
if (!mem->stat) {
|
||||
if (size < PAGE_SIZE)
|
||||
kfree(mem);
|
||||
else
|
||||
vfree(mem);
|
||||
mem = NULL;
|
||||
}
|
||||
if (!mem->stat)
|
||||
goto out_free;
|
||||
spin_lock_init(&mem->pcp_counter_lock);
|
||||
return mem;
|
||||
|
||||
out_free:
|
||||
if (size < PAGE_SIZE)
|
||||
kfree(mem);
|
||||
else
|
||||
vfree(mem);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
Loading…
Reference in a new issue