]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
x86/kprobes: Restore BTF if the single-stepping is cancelled
authorMasami Hiramatsu <mhiramat@kernel.org>
Wed, 28 Oct 2020 14:31:10 +0000 (23:31 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 29 Dec 2020 12:47:01 +0000 (13:47 +0100)
commite1f98fe3521c4a7be4cc3acf47f54edf064ee266
tree54b898c6e1ae1765fe14bbafc71ba9b454b9c10c
parentf2fa0444627df738f7d92f40c6ae82897b16826a
x86/kprobes: Restore BTF if the single-stepping is cancelled

[ Upstream commit 78ff2733ff352175eb7f4418a34654346e1b6cd2 ]

Fix to restore BTF if single-stepping causes a page fault and
it is cancelled.

Usually the BTF flag was restored when the single stepping is done
(in resume_execution()). However, if a page fault happens on the
single stepping instruction, the fault handler is invoked and
the single stepping is cancelled. Thus, the BTF flag is not
restored.

Fixes: 1ecc798c6764 ("x86: debugctlmsr kprobes")
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/160389546985.106936.12727996109376240993.stgit@devnote2
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/x86/kernel/kprobes/core.c