Commit e7bbcdf3 authored by Dan Carpenter's avatar Dan Carpenter Committed by Linus Torvalds

memcontrol: fix potential null deref

There was a potential null deref introduced in c62b1a3b ("memcg: use
generic percpu instead of private implementation").
Signed-off-by: default avatarDan Carpenter <error27@gmail.com>
Acked-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9d34706f
...@@ -3691,8 +3691,10 @@ static struct mem_cgroup *mem_cgroup_alloc(void) ...@@ -3691,8 +3691,10 @@ static struct mem_cgroup *mem_cgroup_alloc(void)
else else
mem = vmalloc(size); mem = vmalloc(size);
if (mem) if (!mem)
memset(mem, 0, size); return NULL;
memset(mem, 0, size);
mem->stat = alloc_percpu(struct mem_cgroup_stat_cpu); mem->stat = alloc_percpu(struct mem_cgroup_stat_cpu);
if (!mem->stat) { if (!mem->stat) {
if (size < PAGE_SIZE) if (size < PAGE_SIZE)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment