| Date | Thu, 24 Feb 2022 15:51:51 +0100 | From | Peter Zijlstra <> | Subject | [PATCH v2 13/39] x86/livepatch: Validate __fentry__ location |
| |
Currently livepatch assumes __fentry__ lives at func+0, which is most likely untrue with IBT on. Instead make it use ftrace_location() by default which both validates and finds the actual ip if there is any in the same symbol.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> --- arch/x86/include/asm/livepatch.h | 9 +++++++++ kernel/livepatch/patch.c | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-)
--- a/kernel/livepatch/patch.c +++ b/kernel/livepatch/patch.c @@ -133,7 +133,7 @@ static void notrace klp_ftrace_handler(u #ifndef klp_get_ftrace_location static unsigned long klp_get_ftrace_location(unsigned long faddr) { - return faddr; + return ftrace_location(faddr); } #endif
|