Преглед изворни кода

memcontrol: fix potential null deref

There was a potential null deref introduced in c62b1a3b31b5 ("memcg: use
generic percpu instead of private implementation").

Signed-off-by: Dan Carpenter <error27@gmail.com>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Dan Carpenter пре 15 година
родитељ
комит
e7bbcdf374
1 измењених фајлова са 4 додато и 2 уклоњено
  1. 4 2
      mm/memcontrol.c

+ 4 - 2
mm/memcontrol.c

@@ -3691,8 +3691,10 @@ static struct mem_cgroup *mem_cgroup_alloc(void)
 	else
 	else
 		mem = vmalloc(size);
 		mem = vmalloc(size);
 
 
-	if (mem)
-		memset(mem, 0, size);
+	if (!mem)
+		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)