Song Liu 805e87af94 ftrace: Clean up hash direct_functions on register failures ... commit 7d54c15cb8 upstream. We see the following GPF when register_ftrace_direct fails: [ ] general protection fault, probably for non-canonical address \ 0x200000000000010: 0000 [#1] PREEMPT SMP DEBUG_PAGEALLOC PTI [...] [ ] RIP: 0010:ftrace_find_rec_direct+0x53/0x70 [ ] Code: 48 c1 e0 03 48 03 42 08 48 8b 10 31 c0 48 85 d2 74 [...] [ ] RSP: 0018:ffffc9000138bc10 EFLAGS: 00010206 [ ] RAX: 0000000000000000 RBX: ffffffff813e0df0 RCX: 000000000000003b [ ] RDX: 0200000000000000 RSI: 000000000000000c RDI: ffffffff813e0df0 [ ] RBP: ffffffffa00a3000 R08: ffffffff81180ce0 R09: 0000000000000001 [ ] R10: ffffc9000138bc18 R11: 0000000000000001 R12: ffffffff813e0df0 [ ] R13: ffffffff813e0df0 R14: ffff888171b56400 R15: 0000000000000000 [ ] FS: 00007fa9420c7780(0000) GS:ffff888ff6a00000(0000) knlGS:000000000 [ ] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ ] CR2: 000000000770d000 CR3: 0000000107d50003 CR4: 0000000000370ee0 [ ] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ ] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ ] Call Trace: [ ] <TASK> [ ] register_ftrace_direct+0x54/0x290 [ ] ? render_sigset_t+0xa0/0xa0 [ ] bpf_trampoline_update+0x3f5/0x4a0 [ ] ? 0xffffffffa00a3000 [ ] bpf_trampoline_link_prog+0xa9/0x140 [ ] bpf_tracing_prog_attach+0x1dc/0x450 [ ] bpf_raw_tracepoint_open+0x9a/0x1e0 [ ] ? find_held_lock+0x2d/0x90 [ ] ? lock_release+0x150/0x430 [ ] __sys_bpf+0xbd6/0x2700 [ ] ? lock_is_held_type+0xd8/0x130 [ ] __x64_sys_bpf+0x1c/0x20 [ ] do_syscall_64+0x3a/0x80 [ ] entry_SYSCALL_64_after_hwframe+0x44/0xae [ ] RIP: 0033:0x7fa9421defa9 [ ] Code: 00 c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00 9 f8 [...] [ ] RSP: 002b:00007ffed743bd78 EFLAGS: 00000246 ORIG_RAX: 0000000000000141 [ ] RAX: ffffffffffffffda RBX: 00000000069d2480 RCX: 00007fa9421defa9 [ ] RDX: 0000000000000078 RSI: 00007ffed743bd80 RDI: 0000000000000011 [ ] RBP: 00007ffed743be00 R08: 0000000000bb7270 R09: 0000000000000000 [ ] R10: 00000000069da210 R11: 0000000000000246 R12: 0000000000000001 [ ] R13: 00007ffed743c4b0 R14: 00000000069d2480 R15: 0000000000000001 [ ] </TASK> [ ] Modules linked in: klp_vm(OK) [ ] ---[ end trace 0000000000000000 ]--- One way to trigger this is: 1. load a livepatch that patches kernel function xxx; 2. run bpftrace -e 'kfunc:xxx {}', this will fail (expected for now); 3. repeat #2 => gpf. This is because the entry is added to direct_functions, but not removed. Fix this by remove the entry from direct_functions when register_ftrace_direct fails. Also remove the last trailing space from ftrace.c, so we don't have to worry about it anymore. Link: https://lkml.kernel.org/r/20220524170839.900849-1-song@kernel.org Cc: stable@vger.kernel.org Fixes: 763e34e74b ("ftrace: Add register_ftrace_direct()") Signed-off-by: Song Liu <song@kernel.org> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2022-06-09 10:26:27 +02:00
..
bpf	bpf: Check PTR_TO_MEM | MEM_RDONLY in check_helper_mem_access	2022-06-06 08:47:57 +02:00
cgroup	cgroup/cpuset: Remove cpus_allowed/mems_allowed setup in cpuset_init_smp()	2022-05-18 10:28:22 +02:00
configs	configs/debug: restore DEBUG_INFO=y for overriding	2022-03-17 11:02:13 -07:00
debug	lockdown: also lock down previous kgdb use	2022-05-25 09:59:10 +02:00
dma	dma-direct: don't over-decrypt memory	2022-06-09 10:25:58 +02:00
entry	entry: Snapshot thread flags	2021-12-01 00:06:43 +01:00
events	signal: Deliver SIGTRAP on perf event asynchronously if blocked	2022-06-09 10:25:41 +02:00
futex	Merge branch 'signal-for-v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace	2022-01-17 05:49:30 +02:00
gcov	gcov: Remove compiler version check	2021-12-02 17:25:21 +09:00
irq	genirq: Remove WARN_ON_ONCE() in generic_handle_domain_irq()	2022-05-18 10:28:20 +02:00
kcsan	KCSAN updates for v5.17	2022-01-11 09:51:26 -08:00
livepatch	livepatch: Fix build failure on 32 bits processors	2022-04-08 13:58:03 +02:00
locking	locking/lockdep: Iterate lock_classes directly when reading lockdep files	2022-04-08 13:58:39 +02:00
power	PM: EM: Decrement policy counter	2022-06-09 10:25:49 +02:00
printk	printk: wake waiters for safe and NMI contexts	2022-06-09 10:25:42 +02:00
rcu	rcu: Make TASKS_RUDE_RCU select IRQ_WORK	2022-06-09 10:25:19 +02:00
sched	sched/psi: report zeroes for CPU full at the system level	2022-06-09 10:25:41 +02:00
time	timekeeping: Add raw clock fallback for random_get_entropy()	2022-05-30 09:27:13 +02:00
trace	ftrace: Clean up hash direct_functions on register failures	2022-06-09 10:26:27 +02:00
.gitignore
acct.c	kernel: remove spurious blkdev.h includes	2021-10-18 06:17:01 -06:00
async.c	Revert "module, async: async_synchronize_full() on module init iff async is used"	2022-02-03 11:20:34 -08:00
audit.c	audit: improve audit queue handling when "audit=1" on cmdline	2022-01-25 13:22:51 -05:00
audit.h	audit: log AUDIT_TIME_* records only from rules	2022-04-08 13:57:35 +02:00
audit_fsnotify.c	fsnotify: clarify contract for create event hooks	2021-10-27 12:32:34 +02:00
audit_tree.c	audit: use struct_size() helper in kmalloc()	2021-12-14 17:39:42 -05:00
audit_watch.c	\n	2021-11-06 16:43:20 -07:00
auditfilter.c	audit/stable-5.17 PR 20220110	2022-01-11 13:08:21 -08:00
auditsc.c	audit,io_uring,io-wq: call __audit_uring_exit for dummy contexts	2022-05-25 09:59:02 +02:00
backtracetest.c
bounds.c
capability.c
cfi.c
compat.c	arch: remove compat_alloc_user_space	2021-09-08 15:32:35 -07:00
configs.c
context_tracking.c
cpu.c	random: clear fast pool, crng, and batches in cpuhp bring up	2022-05-30 09:27:08 +02:00
cpu_pm.c	PM: cpu: Make notifier chain use a raw_spinlock_t	2021-08-16 18:55:32 +02:00
crash_core.c	kernel/crash_core: suppress unknown crashkernel parameter warning	2021-12-25 12:20:55 -08:00
crash_dump.c
cred.c	ucounts: Base set_cred_ucounts changes on the real user	2022-02-17 09:11:02 -06:00
delayacct.c	delayacct: track delays from memory compact	2022-01-20 08:52:55 +02:00
dma.c
exec_domain.c
exit.c	exit: Fix the exit_code for wait_task_zombie	2022-01-08 12:43:57 -06:00
extable.c	extable: use is_kernel_text() helper	2021-11-09 10:02:51 -08:00
fail_function.c
fork.c	kthread: Don't allocate kthread_struct for init and umh	2022-06-09 10:25:16 +02:00
freezer.c
gen_kheaders.sh
groups.c
hung_task.c	hung_task: move hung_task sysctl interface to hung_task.c	2022-01-22 08:33:34 +02:00
iomem.c
irq_work.c	irq_work: use kasan_record_aux_stack_noalloc() record callstack	2022-04-27 14:41:10 +02:00
jump_label.c
kallsyms.c	Livepatching changes for 5.17	2022-01-16 10:08:13 +02:00
kcmp.c
Kconfig.freezer
Kconfig.hz
Kconfig.locks	locking/rwlock: Provide RT variant	2021-08-17 17:50:51 +02:00
Kconfig.preempt	preempt: Restore preemption model selection configs	2021-11-11 13:09:33 +01:00
kcov.c	kcov: replace local_irq_save() with a local_lock_t	2021-11-09 10:02:52 -08:00
kexec.c	kexec: avoid compat_alloc_user_space	2021-09-08 15:32:34 -07:00
kexec_core.c	exit: Move oops specific logic from do_exit into make_task_dead	2021-12-13 12:04:45 -06:00
kexec_elf.c
kexec_file.c	kexec_file: drop weak attribute from arch_kexec_apply_relocations[_add]	2022-06-09 10:26:27 +02:00
kexec_internal.h
kheaders.c
kmod.c
kprobes.c	kprobe: move sysctl_kprobes_optimization to kprobes.c	2022-01-22 08:33:36 +02:00
ksysfs.c
kthread.c	Merge branch 'akpm' (patches from Andrew)	2022-01-20 10:41:01 +02:00
latencytop.c
Makefile	static_call: Don't make __static_call_return0 static	2022-04-13 19:27:43 +02:00
module-internal.h	module: add in-kernel support for decompressing	2022-01-11 18:45:02 -08:00
module.c	module: fix [e_shstrndx].sh_size=0 OOB access	2022-06-09 10:26:07 +02:00
module_decompress.c	module: fix building with sysfs disabled	2022-02-16 12:51:32 -08:00
module_signature.c
module_signing.c
notifier.c	notifier: Return an error when a callback has already been registered	2021-12-29 10:37:33 +01:00
nsproxy.c	memcg: enable accounting for new namesapces and struct nsproxy	2021-09-03 09:58:12 -07:00
padata.c	padata: Remove repeated verbose license text	2021-08-27 16:30:18 +08:00
panic.c	panic: remove oops_id	2022-01-20 08:52:55 +02:00
params.c	kobject: remove kset from struct kset_uevent_ops callbacks	2021-12-28 11:26:18 +01:00
pid.c	pid: add pidfd_get_task() helper	2021-10-14 13:29:18 +02:00
pid_namespace.c	memcg: enable accounting for new namesapces and struct nsproxy	2021-09-03 09:58:12 -07:00
profile.c	exit: Remove profile_handoff_task	2022-01-08 12:43:57 -06:00
ptrace.c	ptrace: Reimplement PTRACE_KILL by always sending SIGKILL	2022-06-09 10:25:16 +02:00
range.c
reboot.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2021-11-12 11:53:16 -08:00
regset.c
relay.c
resource.c	kernel/resource: fix kfree() of bootmem memory again	2022-04-08 13:58:23 +02:00
resource_kunit.c
rseq.c	rseq: Remove broken uapi field layout on 32-bit little endian	2022-04-08 13:57:39 +02:00
scftorture.c	scftorture: Fix distribution of short handler delays	2022-06-09 10:25:39 +02:00
scs.c	scs: Release kasan vmalloc poison in scs_free process	2021-09-30 09:37:27 +01:00
seccomp.c	seccomp: Invalidate seccomp mode to catch death failures	2022-02-10 19:09:12 -08:00
signal.c	signal: Deliver SIGTRAP on perf event asynchronously if blocked	2022-06-09 10:25:41 +02:00
smp.c	smp: Fix offline cpu check in flush_smp_call_function_queue()	2022-04-20 09:36:27 +02:00
smpboot.c
smpboot.h
softirq.c	timers/nohz: Last resort update jiffies on nohz_full IRQ entry	2021-12-02 15:07:22 +01:00
stackleak.c	gcc-plugins/stackleak: Use noinstr in favor of notrace	2022-02-03 17:02:21 -08:00
stacktrace.c	stacktrace: move filter_irq_stacks() to kernel/stacktrace.c	2021-11-06 13:30:43 -07:00
static_call.c	static_call: Don't make __static_call_return0 static	2022-04-13 19:27:43 +02:00
static_call_inline.c	static_call: Don't make __static_call_return0 static	2022-04-13 19:27:43 +02:00
stop_machine.c
sys.c	mm: refactor vm_area_struct::anon_vma_name usage code	2022-03-05 11:08:32 -08:00
sys_ni.c	mm/mempolicy: wire up syscall set_mempolicy_home_node	2022-01-15 16:30:30 +02:00
sysctl-test.c
sysctl.c	x86/speculation: Include unprivileged eBPF status in Spectre v2 mitigation reporting	2022-02-21 10:21:47 +01:00
task_work.c
taskstats.c
torture.c	locktorture,rcutorture,torture: Always log error message	2021-12-07 16:36:17 -08:00
tracepoint.c	tracepoint: Fix kerneldoc comments	2021-08-16 11:39:51 -04:00
tsacct.c	taskstats: Cleanup the use of task->exit_code	2022-01-08 12:43:57 -06:00
ucount.c	ucounts: Handle wrapping in is_ucounts_overlimit	2022-02-17 09:11:57 -06:00
uid16.c
uid16.h
umh.c	kthread: Don't allocate kthread_struct for init and umh	2022-06-09 10:25:16 +02:00
up.c
user-return-notifier.c
user.c	fs/epoll: use a per-cpu counter for user's watches count	2021-09-08 11:50:27 -07:00
user_namespace.c	ucounts: Fix systemd LimitNPROC with private users regression	2022-02-25 10:40:14 -06:00
usermode_driver.c
utsname.c
utsname_sysctl.c
watch_queue.c	watch_queue: Free the page array when watch_queue is dismantled	2022-04-08 13:58:56 +02:00
watchdog.c	watchdog: move watchdog sysctl interface to watchdog.c	2022-01-22 08:33:34 +02:00
watchdog_hld.c
workqueue.c	Merge branch 'workqueue/for-5.16-fixes' into workqueue/for-5.17	2022-01-10 07:54:04 -10:00
workqueue_internal.h	workqueue: Assign a color to barrier work items	2021-08-17 07:49:10 -10:00