From 63de6916f039a64d1aaec23ec9238d7ff4c5fb7c Mon Sep 17 00:00:00 2001 From: Alexander Martinz Date: Tue, 12 May 2026 12:10:40 +0200 Subject: [PATCH] Reapply "UPSTREAM: seccomp: Remove bogus __user annotations" This reverts commit cb8dc8a108d69ce584fd1f44c5a738c4e11dcb49. As pointed out on gerrit[1]: > This revert is wrong. `android12-5.4` doesn't have > "sysctl: pass kernel pointers to ->proc_handler" but this kernel does. [1] - https://review.lineageos.org/c/LineageOS/android_kernel_qcom_sm8350/+/482457 Change-Id: I72cd996f6739a67cf78141843e2d933f19e2e92b Signed-off-by: Alexander Martinz --- kernel/seccomp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/seccomp.c b/kernel/seccomp.c index 455330c8b9ba..1ec9bdc1e208 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 __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)]; @@ -2053,7 +2053,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)];