From: Christoph Hellwig <hch@lst.de>
To: Al Viro <viro@zeniv.linux.org.uk>,
Linus Torvalds <torvalds@linux-foundation.org>
Cc: Luis Chamberlain <mcgrof@kernel.org>,
Matthew Wilcox <willy@infradead.org>,
Kees Cook <keescook@chromium.org>,
Iurii Zaikin <yzaikin@google.com>,
linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: [PATCH 19/23] sysctl: Call sysctl_head_finish on error
Date: Wed, 1 Jul 2020 22:09:47 +0200 [thread overview]
Message-ID: <20200701200951.3603160-20-hch@lst.de> (raw)
In-Reply-To: <20200701200951.3603160-1-hch@lst.de>
From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
This error path returned directly instead of calling sysctl_head_finish().
Fixes: ef9d965bc8b6 ("sysctl: reject gigantic reads/write to sysctl files")
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
fs/proc/proc_sysctl.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index 42c5128c7d1c76..6c1166ccdaea57 100644
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
@@ -566,8 +566,9 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *ubuf,
goto out;
/* don't even try if the size is too large */
- if (count > KMALLOC_MAX_SIZE)
- return -ENOMEM;
+ error = -ENOMEM;
+ if (count >= KMALLOC_MAX_SIZE)
+ goto out;
if (write) {
kbuf = memdup_user_nul(ubuf, count);
@@ -576,7 +577,6 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *ubuf,
goto out;
}
} else {
- error = -ENOMEM;
kbuf = kzalloc(count, GFP_KERNEL);
if (!kbuf)
goto out;
--
2.26.2
next prev parent reply other threads:[~2020-07-01 20:23 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-01 20:09 [RFC] stop using ->read and ->write for kernel access v3 Christoph Hellwig
2020-07-01 20:09 ` [PATCH 01/23] cachefiles: switch to kernel_write Christoph Hellwig
2020-07-01 20:09 ` [PATCH 02/23] autofs: " Christoph Hellwig
2020-07-01 20:09 ` [PATCH 03/23] bpfilter: " Christoph Hellwig
2020-07-01 20:09 ` [PATCH 04/23] fs: unexport __kernel_write Christoph Hellwig
2020-07-01 20:09 ` [PATCH 05/23] fs: check FMODE_WRITE in __kernel_write Christoph Hellwig
2020-07-01 20:09 ` [PATCH 06/23] fs: implement kernel_write using __kernel_write Christoph Hellwig
2020-07-01 20:09 ` [PATCH 07/23] fs: remove __vfs_write Christoph Hellwig
2020-07-01 20:09 ` [PATCH 08/23] fs: don't change the address limit for ->write_iter in __kernel_write Christoph Hellwig
2020-07-01 20:09 ` [PATCH 09/23] fs: add a __kernel_read helper Christoph Hellwig
2020-07-01 20:09 ` [PATCH 10/23] integrity/ima: switch to using __kernel_read Christoph Hellwig
2020-07-01 20:09 ` [PATCH 11/23] fs: implement kernel_read " Christoph Hellwig
2020-07-01 20:09 ` [PATCH 12/23] fs: remove __vfs_read Christoph Hellwig
2020-07-01 20:09 ` [PATCH 13/23] fs: don't change the address limit for ->read_iter in __kernel_read Christoph Hellwig
2020-07-01 20:09 ` [PATCH 14/23] fs: refactor new_sync_read Christoph Hellwig
2020-07-01 20:09 ` [PATCH 15/23] seq_file: add seq_read_iter Christoph Hellwig
2020-07-01 20:09 ` [PATCH 16/23] seq_file: switch over direct seq_read method calls to seq_read_iter Christoph Hellwig
2020-07-02 9:46 ` Miguel Ojeda
2020-07-02 13:50 ` Christoph Hellwig
2020-07-03 5:56 ` Miguel Ojeda
2020-07-03 7:44 ` Joe Perches
2020-07-03 9:35 ` Miguel Ojeda
2020-07-03 9:43 ` Joe Perches
2020-07-01 20:09 ` [PATCH 17/23] proc: add a read_iter method to proc proc_ops Christoph Hellwig
2020-07-01 21:27 ` Al Viro
2020-07-02 5:18 ` Christoph Hellwig
2020-07-02 7:30 ` Christoph Hellwig
2020-07-01 20:09 ` [PATCH 18/23] proc: switch over direct seq_read method calls to seq_read_iter Christoph Hellwig
2020-07-01 20:09 ` Christoph Hellwig [this message]
2020-07-02 0:32 ` [PATCH 19/23] sysctl: Call sysctl_head_finish on error Matthew Wilcox
2020-07-02 5:15 ` Christoph Hellwig
2020-07-03 1:34 ` Al Viro
2020-07-01 20:09 ` [PATCH 20/23] sysctl: Convert to iter interfaces Christoph Hellwig
2020-07-01 20:09 ` [PATCH 21/23] fs: don't allow kernel reads and writes without iter ops Christoph Hellwig
2020-07-01 20:09 ` [PATCH 22/23] fs: default to generic_file_splice_read for files having ->read_iter Christoph Hellwig
2020-07-01 20:09 ` [PATCH 23/23] fs: don't allow splice read/write without explicit ops 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=20200701200951.3603160-20-hch@lst.de \
--to=hch@lst.de \
--cc=keescook@chromium.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mcgrof@kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=viro@zeniv.linux.org.uk \
--cc=willy@infradead.org \
--cc=yzaikin@google.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®