Commit 54fa9ba5 authored Sep 07, 2020 by Tobias Klauser Committed by Steven Rostedt (VMware) Sep 18, 2020

ftrace: Let ftrace_enable_sysctl take a kernel pointer buffer

Commit 32927393 ("sysctl: pass kernel pointers to ->proc_handler")
changed ctl_table.proc_handler to take a kernel pointer. Adjust the
signature of ftrace_enable_sysctl to match ctl_table.proc_handler which
fixes the following sparse warning:

kernel/trace/ftrace.c:7544:43: warning: incorrect type in argument 3 (different address spaces)
kernel/trace/ftrace.c:7544:43:    expected void *
kernel/trace/ftrace.c:7544:43:    got void [noderef] __user *buffer

Link: https://lkml.kernel.org/r/20200907093207.13540-1-tklauser@distanz.ch



Fixes: 32927393 ("sysctl: pass kernel pointers to ->proc_handler")
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

parent 795d6379

include/linux/ftrace.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -85,8 +85,7 @@ static inline int ftrace_mod_get_kallsym(unsigned int symnum, unsigned long *val
		extern int ftrace_enabled;
		extern int
		ftrace_enable_sysctl(struct ctl_table *table, int write,
		void __user buffer, size_t lenp,
		loff_t *ppos);
		void buffer, size_t lenp, loff_t *ppos);

		struct ftrace_ops;

kernel/trace/ftrace.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -7534,8 +7534,7 @@ static bool is_permanent_ops_registered(void)

		int
		ftrace_enable_sysctl(struct ctl_table *table, int write,
		void __user buffer, size_t lenp,
		loff_t *ppos)
		void buffer, size_t lenp, loff_t *ppos)
		{
		int ret = -ENODEV;

Admin message