Linux-Fsdevel Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: Al Viro <viro@zeniv.linux.org.uk>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Ian Kent <raven@themaw.net>, David Howells <dhowells@redhat.com>,
linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-security-module@vger.kernel.org,
netfilter-devel@vger.kernel.org
Subject: [PATCH 09/13] fs: add a __kernel_read helper
Date: Mon, 15 Jun 2020 14:12:53 +0200 [thread overview]
Message-ID: <20200615121257.798894-10-hch@lst.de> (raw)
In-Reply-To: <20200615121257.798894-1-hch@lst.de>
This is the counterpart to __kernel_write, and skip the rw_verify_area
call compared to kernel_read.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/read_write.c | 21 +++++++++++++++++++++
include/linux/fs.h | 1 +
2 files changed, 22 insertions(+)
diff --git a/fs/read_write.c b/fs/read_write.c
index 4fb7966f023526..3364fdfc2982b4 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -430,6 +430,27 @@ ssize_t __vfs_read(struct file *file, char __user *buf, size_t count,
return -EINVAL;
}
+ssize_t __kernel_read(struct file *file, void *buf, size_t count, loff_t *pos)
+{
+ mm_segment_t old_fs = get_fs();
+ ssize_t ret;
+
+ if (!(file->f_mode & FMODE_CAN_READ))
+ return -EINVAL;
+
+ if (count > MAX_RW_COUNT)
+ count = MAX_RW_COUNT;
+ set_fs(KERNEL_DS);
+ ret = __vfs_read(file, (void __user *)buf, count, pos);
+ set_fs(old_fs);
+ if (ret > 0) {
+ fsnotify_access(file);
+ add_rchar(current, ret);
+ }
+ inc_syscr(current);
+ return ret;
+}
+
ssize_t kernel_read(struct file *file, void *buf, size_t count, loff_t *pos)
{
mm_segment_t old_fs;
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 6c4ab4dc1cd718..21613bf1b49690 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -3035,6 +3035,7 @@ extern int kernel_read_file_from_path_initns(const char *, void **, loff_t *, lo
extern int kernel_read_file_from_fd(int, void **, loff_t *, loff_t,
enum kernel_read_file_id);
extern ssize_t kernel_read(struct file *, void *, size_t, loff_t *);
+ssize_t __kernel_read(struct file *file, void *buf, size_t count, loff_t *pos);
extern ssize_t kernel_write(struct file *, const void *, size_t, loff_t *);
extern ssize_t __kernel_write(struct file *, const void *, size_t, loff_t *);
extern struct file * open_exec(const char *);
--
2.26.2
next prev parent reply other threads:[~2020-06-15 12:13 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-15 12:12 clean up kernel_{read,write} & friends v4 Christoph Hellwig
2020-06-15 12:12 ` [PATCH 01/13] cachefiles: switch to kernel_write Christoph Hellwig
2020-06-15 12:12 ` [PATCH 02/13] autofs: " Christoph Hellwig
2020-06-15 12:12 ` [PATCH 03/13] bpfilter: " Christoph Hellwig
2020-06-15 12:12 ` [PATCH 04/13] fs: unexport __kernel_write Christoph Hellwig
2020-06-15 12:12 ` [PATCH 05/13] fs: check FMODE_WRITE in __kernel_write Christoph Hellwig
2020-06-15 12:34 ` Matthew Wilcox
2020-06-15 13:48 ` Christoph Hellwig
2020-06-15 16:39 ` Linus Torvalds
2020-06-15 16:42 ` Christoph Hellwig
2020-06-17 14:59 ` David Laight
2020-06-15 12:12 ` [PATCH 06/13] fs: implement kernel_write using __kernel_write Christoph Hellwig
2020-06-15 12:12 ` [PATCH 07/13] fs: remove __vfs_write Christoph Hellwig
2020-06-15 12:12 ` [PATCH 08/13] fs: don't change the address limit for ->write_iter in __kernel_write Christoph Hellwig
2020-06-15 12:12 ` Christoph Hellwig [this message]
2020-06-15 12:12 ` [PATCH 10/13] integrity/ima: switch to using __kernel_read Christoph Hellwig
2020-06-15 16:46 ` Linus Torvalds
2020-06-15 16:56 ` Linus Torvalds
2020-06-15 12:12 ` [PATCH 11/13] fs: implement kernel_read " Christoph Hellwig
2020-06-15 12:12 ` [PATCH 12/13] fs: remove __vfs_read Christoph Hellwig
2020-06-15 12:12 ` [PATCH 13/13] 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=20200615121257.798894-10-hch@lst.de \
--to=hch@lst.de \
--cc=dhowells@redhat.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=raven@themaw.net \
--cc=torvalds@linux-foundation.org \
--cc=viro@zeniv.linux.org.uk \
--subject='Re: [PATCH 09/13] fs: add a __kernel_read helper' \
/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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).