linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2] seccomp: Remove bogus __user annotations
@ 2020-11-20 17:05 Jann Horn
  2020-11-20 19:40 ` Kees Cook
  0 siblings, 1 reply; 2+ messages in thread
From: Jann Horn @ 2020-11-20 17:05 UTC (permalink / raw)
  To: Kees Cook
  Cc: Andy Lutomirski, Will Drewry, linux-kernel, Tyler Hicks,
	Christoph Hellwig

Buffers that are passed to read_actions_logged() and write_actions_logged()
are in kernel memory; the sysctl core takes care of copying from/to
userspace.

Fixes: 32927393dc1c ("sysctl: pass kernel pointers to ->proc_handler")
Reviewed-by: Tyler Hicks <code@tyhicks.com>
Signed-off-by: Jann Horn <jannh@google.com>
---
v2: corrected "Fixes" tag

 kernel/seccomp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/seccomp.c b/kernel/seccomp.c
index 8ad7a293255a..c2bff3561846 100644
--- a/kernel/seccomp.c
+++ b/kernel/seccomp.c
@@ -1968,7 +1968,7 @@ static bool seccomp_actions_logged_from_names(u32 *actions_logged, char *names)
 	return true;
 }
 
-static int read_actions_logged(struct ctl_table *ro_table, void __user *buffer,
+static int read_actions_logged(struct ctl_table *ro_table, void *buffer,
 			       size_t *lenp, loff_t *ppos)
 {
 	char names[sizeof(seccomp_actions_avail)];
@@ -1986,7 +1986,7 @@ static int read_actions_logged(struct ctl_table *ro_table, void __user *buffer,
 	return proc_dostring(&table, 0, buffer, lenp, ppos);
 }
 
-static int write_actions_logged(struct ctl_table *ro_table, void __user *buffer,
+static int write_actions_logged(struct ctl_table *ro_table, void *buffer,
 				size_t *lenp, loff_t *ppos, u32 *actions_logged)
 {
 	char names[sizeof(seccomp_actions_avail)];

base-commit: 4d02da974ea85a62074efedf354e82778f910d82
-- 
2.29.2.454.gaff20da3a2-goog


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH v2] seccomp: Remove bogus __user annotations
  2020-11-20 17:05 [PATCH v2] seccomp: Remove bogus __user annotations Jann Horn
@ 2020-11-20 19:40 ` Kees Cook
  0 siblings, 0 replies; 2+ messages in thread
From: Kees Cook @ 2020-11-20 19:40 UTC (permalink / raw)
  To: Jann Horn
  Cc: Kees Cook, Tyler Hicks, Christoph Hellwig, linux-kernel,
	Will Drewry, Andy Lutomirski

On Fri, 20 Nov 2020 18:05:45 +0100, Jann Horn wrote:
> Buffers that are passed to read_actions_logged() and write_actions_logged()
> are in kernel memory; the sysctl core takes care of copying from/to
> userspace.

Applied to for-next/seccomp, thanks!

[1/1] seccomp: Remove bogus __user annotations
      https://git.kernel.org/kees/c/fab686eb0307

-- 
Kees Cook


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-11-20 19:40 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-20 17:05 [PATCH v2] seccomp: Remove bogus __user annotations Jann Horn
2020-11-20 19:40 ` Kees Cook

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).