All of lore.kernel.org
 help / color / mirror / Atom feed
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 6/9] sysctl: Call sysctl_head_finish on error
Date: Fri, 26 Jun 2020 09:58:33 +0200	[thread overview]
Message-ID: <20200626075836.1998185-7-hch@lst.de> (raw)
In-Reply-To: <20200626075836.1998185-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


  parent reply	other threads:[~2020-06-26  7:59 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-26  7:58 [RFC] stop using ->read and ->write for kernel access v2 Christoph Hellwig
2020-06-26  7:58 ` [PATCH 1/9] fs: refactor new_sync_read Christoph Hellwig
2020-06-26  7:58 ` [PATCH 2/9] proc: add a read_iter method to proc proc_ops Christoph Hellwig
2020-06-26 12:06   ` Luis Chamberlain
2020-06-26 13:36     ` Christoph Hellwig
2020-06-26  7:58 ` [PATCH 3/9] seq_file: add seq_read_iter Christoph Hellwig
2020-06-26  7:58 ` [PATCH 4/9] seq_file: switch over direct seq_read method calls to seq_read_iter Christoph Hellwig
2020-06-26  7:58 ` [PATCH 5/9] proc: " Christoph Hellwig
2020-06-26  7:58 ` Christoph Hellwig [this message]
2020-06-26 12:17   ` [PATCH 6/9] sysctl: Call sysctl_head_finish on error Luis Chamberlain
2020-06-26 12:27     ` Matthew Wilcox
2020-06-26  7:58 ` [PATCH 7/9] sysctl: Convert to iter interfaces Christoph Hellwig
2020-06-26  7:58 ` [PATCH 8/9] fs: don't allow kernel reads and writes without iter ops Christoph Hellwig
2020-06-26 12:27   ` Luis Chamberlain
2020-06-26 13:37     ` Christoph Hellwig
2020-06-26 13:51   ` Matthew Wilcox
2020-06-26 21:05     ` Kees Cook
2020-06-27  7:10     ` Christoph Hellwig
2020-06-26  7:58 ` [PATCH 9/9] fs: don't allow splice read/write without explicit ops Christoph Hellwig
2020-06-27 22:15 ` [RFC] stop using ->read and ->write for kernel access v2 Linus Torvalds
2020-06-28  7:20   ` 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=20200626075836.1998185-7-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 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.