summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakamori Yamaguchi <takamori.yamaguchi@jp.sony.com>2012-11-08 15:53:39 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-26 11:37:19 -0800
commit3f874ecc49208f3635e29c3a08ade01778ad85e4 (patch)
tree13a274853bac30e5a564bcc42a26e2ec585bbbd6
parent16286083befef95045f84ecc10f19b1a14fc7283 (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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--mm/vmscan.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c
index e989ee22f100..e6ca5051c021 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -3128,6 +3128,8 @@ static int kswapd(void *p)
&balanced_classzone_idx);
}
}
+
+ current->reclaim_state = NULL;
return 0;
}