Skip to content

Commit 4025ab3

Browse files
Michal Hockogregkh
authored andcommitted
mm, fs: check for fatal signals in do_generic_file_read()
commit 5abf186a30a89d5b9c18a6bf93a2c192c9fd52f6 upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent e86a876 commit 4025ab3

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

mm/filemap.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1559,6 +1559,11 @@ static ssize_t do_generic_file_read(struct file *filp, loff_t *ppos,
15591559

15601560
cond_resched();
15611561
find_page:
1562+
if (fatal_signal_pending(current)) {
1563+
error = -EINTR;
1564+
goto out;
1565+
}
1566+
15621567
page = find_get_page(mapping, index);
15631568
if (!page) {
15641569
page_cache_sync_readahead(mapping,

0 commit comments

Comments
 (0)