summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorJesper Juhl <jj@chaosbits.net>2011-01-25 15:07:24 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-26 10:50:01 +1000
commit8dba474f034c322d96ada39cb20cac711d80dcb2 (patch)
treeef007c5c3088b2ef83be074a7720892b6b8e5e4b /mm
parent2ff754fa8f416e82327f2d8f1354a033b66286df (diff)
downloadlinux-stable-8dba474f034c322d96ada39cb20cac711d80dcb2.tar.gz
linux-stable-8dba474f034c322d96ada39cb20cac711d80dcb2.tar.bz2
linux-stable-8dba474f034c322d96ada39cb20cac711d80dcb2.zip
mm/memcontrol.c: fix uninitialized variable use in mem_cgroup_move_parent()
In mm/memcontrol.c::mem_cgroup_move_parent() there's a path that jumps to the 'put_back' label ret = __mem_cgroup_try_charge(NULL, gfp_mask, &parent, false, charge); if (ret || !parent) goto put_back; where we'll if (charge > PAGE_SIZE) compound_unlock_irqrestore(page, flags); but, we have not assigned anything to 'flags' at this point, nor have we called 'compound_lock_irqsave()' (which is what sets 'flags'). The 'put_back' label should be moved below the call to compound_unlock_irqrestore() as per this patch. Signed-off-by: Jesper Juhl <jj@chaosbits.net> Cc: Balbir Singh <balbir@linux.vnet.ibm.com> Cc: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: Pavel Emelianov <xemul@openvz.org> Cc: "Kirill A. Shutemov" <kirill@shutemov.name> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/memcontrol.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index db76ef726293..4fcf47a62550 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2292,9 +2292,10 @@ static int mem_cgroup_move_parent(struct page_cgroup *pc,
ret = mem_cgroup_move_account(pc, child, parent, true, charge);
if (ret)
mem_cgroup_cancel_charge(parent, charge);
-put_back:
+
if (charge > PAGE_SIZE)
compound_unlock_irqrestore(page, flags);
+put_back:
putback_lru_page(page);
put:
put_page(page);