]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
ftrace: Fix issue that 'direct->addr' not restored in modify_ftrace_direct()
authorZheng Yejian <zhengyejian1@huawei.com>
Thu, 30 Mar 2023 02:52:23 +0000 (10:52 +0800)
committerRoxana Nicolescu <roxana.nicolescu@canonical.com>
Wed, 17 May 2023 11:34:00 +0000 (13:34 +0200)
commit0133d64a534533e883d4ed37a24e0801318be1aa
tree30e3013e3c3766812ec3956863b48115589361c2
parent511a810581ccfac67e6f93a0291265d2a45a52b3
ftrace: Fix issue that 'direct->addr' not restored in modify_ftrace_direct()

BugLink: https://bugs.launchpad.net/bugs/2016879
commit 2a2d8c51defb446e8d89a83f42f8e5cd529111e9 upstream.

Syzkaller report a WARNING: "WARN_ON(!direct)" in modify_ftrace_direct().

Root cause is 'direct->addr' was changed from 'old_addr' to 'new_addr' but
not restored if error happened on calling ftrace_modify_direct_caller().
Then it can no longer find 'direct' by that 'old_addr'.

To fix it, restore 'direct->addr' to 'old_addr' explicitly in error path.

Link: https://lore.kernel.org/linux-trace-kernel/20230330025223.1046087-1-zhengyejian1@huawei.com
Cc: stable@vger.kernel.org
Cc: <mhiramat@kernel.org>
Cc: <mark.rutland@arm.com>
Cc: <ast@kernel.org>
Cc: <daniel@iogearbox.net>
Fixes: 8a141dd7f706 ("ftrace: Fix modify_ftrace_direct.")
Signed-off-by: Zheng Yejian <zhengyejian1@huawei.com>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
kernel/trace/ftrace.c