summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorTakamori Yamaguchi <takamori.yamaguchi@jp.sony.com>2012-11-08 15:53:39 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-11-09 06:41:47 +0100
commitb0a8cc58e6b9aaae3045752059e5e6260c0b94bc (patch)
tree9c699b9a9bdeeb940b2e96b4cd5325061dd28b02 /mm
parent848561d368751a1c0f679b9f045a02944506a801 (diff)
downloadlinux-3.10-b0a8cc58e6b9aaae3045752059e5e6260c0b94bc.tar.gz
linux-3.10-b0a8cc58e6b9aaae3045752059e5e6260c0b94bc.tar.bz2
linux-3.10-b0a8cc58e6b9aaae3045752059e5e6260c0b94bc.zip
mm: bugfix: set current->reclaim_state to NULL while returning from kswapd()
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> Cc: <stable@vger.kernel.org> 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/vmscan.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 2624edcfb42..8b055e9379b 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -3017,6 +3017,8 @@ static int kswapd(void *p)
&balanced_classzone_idx);
}
}
+
+ current->reclaim_state = NULL;
return 0;
}