aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Hocko <mhocko@suse.com>2017-02-03 16:13:29 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2017-02-03 17:13:19 -0500
commit5abf186a30a89d5b9c18a6bf93a2c192c9fd52f6 (patch)
tree5cb5c671a5ca2b92a1a54a2721a8c06a493966d1
parentd1908f52557b3230fbd63c0429f3b4b748bf2b6d (diff)
mm, fs: check for fatal signals in do_generic_file_read()
do_generic_file_read() can be told to perform a large request from userspace. If the system is under OOM and the reading task is the OOM victim then it has an access to memory reserves and finishing the full request can lead to the full memory depletion which is dangerous. Make sure we rather go with a short read and allow the killed task to terminate. Link: http://lkml.kernel.org/r/20170201092706.9966-3-mhocko@kernel.org Signed-off-by: Michal Hocko <mhocko@suse.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/filemap.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/mm/filemap.c b/mm/filemap.c
index b772a33ef640..3f9afded581b 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1791,6 +1791,11 @@ static ssize_t do_generic_file_read(struct file *filp, loff_t *ppos,
1791 1791
1792 cond_resched(); 1792 cond_resched();
1793find_page: 1793find_page:
1794 if (fatal_signal_pending(current)) {
1795 error = -EINTR;
1796 goto out;
1797 }
1798
1794 page = find_get_page(mapping, index); 1799 page = find_get_page(mapping, index);
1795 if (!page) { 1800 if (!page) {
1796 page_cache_sync_readahead(mapping, 1801 page_cache_sync_readahead(mapping,