summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakamori Yamaguchi <takamori.yamaguchi@jp.sony.com>2012-11-08 15:53:39 -0800
committerBen Hutchings <ben@decadent.org.uk>2012-11-16 16:47:13 +0000
commit3f2a7f33cab017aaf692a499439b8cd6b8998c7f (patch)
tree837f68d84ed595d8866ba4fe9934864ae903ad69
parentca6072f097be890dc39ad6423522ab7bda42d0b7 (diff)
mm: bugfix: set current->reclaim_state to NULL while returning from kswapd()
commit b0a8cc58e6b9aaae3045752059e5e6260c0b94bc upstream. In kswapd(), set current->reclaim_state to NULL before returning, as current->reclaim_state holds reference to variable on kswapd()'s stack. In rare cases, while returning from kswapd() during memory offlining, __free_slab() and freepages() can access the dangling pointer of current->reclaim_state. Signed-off-by: Takamori Yamaguchi <takamori.yamaguchi@jp.sony.com> Signed-off-by: Aaditya Kumar <aaditya.kumar@ap.sony.com> Acked-by: David Rientjes <rientjes@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r--mm/vmscan.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 86eb848259a9..313381cc88ac 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -3015,6 +3015,8 @@ static int kswapd(void *p)
&balanced_classzone_idx);
}
}
+
+ current->reclaim_state = NULL;
return 0;
}