From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752069AbdH3PCs (ORCPT ); Wed, 30 Aug 2017 11:02:48 -0400 Received: from bombadil.infradead.org ([65.50.211.133]:46851 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751631AbdH3PAg (ORCPT ); Wed, 30 Aug 2017 11:00:36 -0400 From: Christoph Hellwig To: viro@zeniv.linux.org.uk Cc: arve@android.com, riandrews@android.com, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 08/16] mm/nommu: switch do_mmap_private to kernel_read Date: Wed, 30 Aug 2017 16:59:59 +0200 Message-Id: <20170830150007.3953-9-hch@lst.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170830150007.3953-1-hch@lst.de> References: <20170830150007.3953-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Instead of playing with the address limit. This also gains us validation of the kvec and proper atime updates. Signed-off-by: Christoph Hellwig --- mm/nommu.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/mm/nommu.c b/mm/nommu.c index fc184f597d59..379f1022bdea 100644 --- a/mm/nommu.c +++ b/mm/nommu.c @@ -1164,17 +1164,8 @@ static int do_mmap_private(struct vm_area_struct *vma, if (vma->vm_file) { /* read the contents of a file into the copy */ - mm_segment_t old_fs; - loff_t fpos; - - fpos = vma->vm_pgoff; - fpos <<= PAGE_SHIFT; - - old_fs = get_fs(); - set_fs(KERNEL_DS); - ret = __vfs_read(vma->vm_file, base, len, &fpos); - set_fs(old_fs); - + loff_t fpos = vma->vm_pgoff << PAGE_SHIFT; + ret = kernel_read(vma->vm_file, base, len, &fpos); if (ret < 0) goto error_free; -- 2.11.0