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:34:33 -0800
commit218440d541517f1c8c6c5349e105dbf23b371b26 (patch)
tree163a0a05c9bb179892e150cd3e90e818dba15db5
parent89d2d133c6947c04a8ab539b997f266535beaafe (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 5326f98f506e..217473379e94 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -2977,6 +2977,8 @@ static int kswapd(void *p)
&balanced_classzone_idx);
}
}
+
+ current->reclaim_state = NULL;
return 0;
}