Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit e7bbcdf3747e3919c31cfa87853c69d178bce548

Authored by Dan Carpenter
Committed by Linus Torvalds
1 parent 9d34706f42
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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>

Showing 1 changed file with 4 additions and 2 deletions Side-by-side Diff

... ... @@ -3691,8 +3691,10 @@
3691 3691 else
3692 3692 mem = vmalloc(size);
3693 3693  
3694   - if (mem)
3695   - memset(mem, 0, size);
  3694 + if (!mem)
  3695 + return NULL;
  3696 +
  3697 + memset(mem, 0, size);
3696 3698 mem->stat = alloc_percpu(struct mem_cgroup_stat_cpu);
3697 3699 if (!mem->stat) {
3698 3700 if (size < PAGE_SIZE)