From cb8dc8a108d69ce584fd1f44c5a738c4e11dcb49 Mon Sep 17 00:00:00 2001 From: Jeff Vander Stoep Date: Fri, 28 Jan 2022 08:11:48 +0100 Subject: [PATCH] Revert "UPSTREAM: seccomp: Remove bogus __user annotations" This reverts commit 5444477e8a4d31f6e6ff720c2d018d06e405bcc1. Bug: 176068146 Signed-off-by: Jeff Vander Stoep Change-Id: Ic35b23f2f3ad99093b7df5e82633bba90acbe82a --- kernel/seccomp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/seccomp.c b/kernel/seccomp.c index 1ec9bdc1e208..455330c8b9ba 100644 --- a/kernel/seccomp.c +++ b/kernel/seccomp.c @@ -2035,7 +2035,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 *buffer, +static int read_actions_logged(struct ctl_table *ro_table, void __user *buffer, size_t *lenp, loff_t *ppos) { char names[sizeof(seccomp_actions_avail)]; @@ -2053,7 +2053,7 @@ static int read_actions_logged(struct ctl_table *ro_table, void *buffer, return proc_dostring(&table, 0, buffer, lenp, ppos); } -static int write_actions_logged(struct ctl_table *ro_table, void *buffer, +static int write_actions_logged(struct ctl_table *ro_table, void __user *buffer, size_t *lenp, loff_t *ppos, u32 *actions_logged) { char names[sizeof(seccomp_actions_avail)];