]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
arm64: debug: Ensure debug handlers check triggering exception level
authorWill Deacon <will.deacon@arm.com>
Fri, 1 Mar 2019 13:28:01 +0000 (13:28 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 5 Apr 2019 20:29:03 +0000 (22:29 +0200)
commit1d7f481de6d016bfa4c2a57880ad06bc788476ee
treef2c5deba499eb888951f1da28b9aaca44744d70e
parentcc785dc69da25011f99f87e0fcaad657e959b657
arm64: debug: Ensure debug handlers check triggering exception level

commit 6bd288569b50bc89fa5513031086746968f585cb upstream.

Debug exception handlers may be called for exceptions generated both by
user and kernel code. In many cases, this is checked explicitly, but
in other cases things either happen to work by happy accident or they
go slightly wrong. For example, executing 'brk #4' from userspace will
enter the kprobes code and be ignored, but the instruction will be
retried forever in userspace instead of delivering a SIGTRAP.

Fix this issue in the most stable-friendly fashion by simply adding
explicit checks of the triggering exception level to all of our debug
exception handlers.

Cc: <stable@vger.kernel.org>
Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/arm64/kernel/kgdb.c
arch/arm64/kernel/probes/kprobes.c