All of lore.kernel.org
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: Al Viro <viro@zeniv.linux.org.uk>
Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
	linux-security-module@vger.kernel.org
Subject: [PATCH 04/11] fs: implement kernel_write using __kernel_write
Date: Fri,  8 May 2020 11:22:15 +0200	[thread overview]
Message-ID: <20200508092222.2097-5-hch@lst.de> (raw)
In-Reply-To: <20200508092222.2097-1-hch@lst.de>

Consolidate the two in-kernel write helpers to make upcoming changes
easier.  The only difference are the missing call to rw_verify_area
in kernel_write, and an access_ok check that doesn't make sense for
kernel buffers to start with.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 fs/read_write.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/fs/read_write.c b/fs/read_write.c
index d91fe7ff6cc55..6b456a257b31c 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -531,16 +531,13 @@ EXPORT_SYMBOL(__kernel_write);
 ssize_t kernel_write(struct file *file, const void *buf, size_t count,
 			    loff_t *pos)
 {
-	mm_segment_t old_fs;
-	ssize_t res;
 
-	old_fs = get_fs();
-	set_fs(KERNEL_DS);
-	/* The cast to a user pointer is valid due to the set_fs() */
-	res = vfs_write(file, (__force const char __user *)buf, count, pos);
-	set_fs(old_fs);
+	ssize_t ret;
 
-	return res;
+	ret = rw_verify_area(WRITE, file, pos, count);
+	if (ret)
+		return ret;
+	return __kernel_write(file, buf, count, pos);
 }
 EXPORT_SYMBOL(kernel_write);
 
-- 
2.26.2


  parent reply	other threads:[~2020-05-08  9:22 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-08  9:22 clean up kernel_{read,write} & friends Christoph Hellwig
2020-05-08  9:22 ` [PATCH 01/11] fs: call file_{start,end}_write from __kernel_write Christoph Hellwig
2020-05-08  9:22 ` [PATCH 02/11] fs: check FMODE_WRITE in __kernel_write Christoph Hellwig
2020-05-08  9:22 ` [PATCH 03/11] fs: remove the call_{read,write}_iter functions Christoph Hellwig
2020-05-08  9:22 ` Christoph Hellwig [this message]
2020-05-08  9:22 ` [PATCH 05/11] fs: remove __vfs_write Christoph Hellwig
2020-05-08  9:22 ` [PATCH 06/11] fs: don't change the address limit for ->write_iter in __kernel_write Christoph Hellwig
2020-05-08  9:22 ` [PATCH 07/11] fs: add a __kernel_read helper Christoph Hellwig
2020-05-08  9:22 ` [PATCH 08/11] integrity/ima: switch to using __kernel_read Christoph Hellwig
2020-05-08  9:22 ` [PATCH 09/11] fs: implement kernel_read " Christoph Hellwig
2020-05-08  9:22 ` [PATCH 10/11] fs: remove __vfs_read Christoph Hellwig
2020-05-08 15:45   ` Ira Weiny
2020-05-08 15:46     ` Christoph Hellwig
2020-05-08  9:22 ` [PATCH 11/11] fs: don't change the address limit for ->read_iter in __kernel_read Christoph Hellwig

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200508092222.2097-5-hch@lst.de \
    --to=hch@lst.de \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-security-module@vger.kernel.org \
    --cc=viro@zeniv.linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.