arm64: debug: Don't propagate UNKNOWN FAR into si_code for debug signals
authorWill Deacon <will.deacon@arm.com>
Fri, 1 Mar 2019 13:28:00 +0000 (13:28 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 5 Apr 2019 20:31:24 +0000 (22:31 +0200)
commit34cc16629523f361138731fc417c8e3c10b311b6
tree3a3a61ed7589bb6cb341e86384a54879e99c5237
parent80bf6c64d5cca26b4d2a94e38cbd89c2615a25c3
arm64: debug: Don't propagate UNKNOWN FAR into si_code for debug signals

commit b9a4b9d084d978f80eb9210727c81804588b42ff upstream.

FAR_EL1 is UNKNOWN for all debug exceptions other than those caused by
taking a hardware watchpoint. Unfortunately, if a debug handler returns
a non-zero value, then we will propagate the UNKNOWN FAR value to
userspace via the si_addr field of the SIGTRAP siginfo_t.

Instead, let's set si_addr to take on the PC of the faulting instruction,
which we have available in the current pt_regs.

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/mm/fault.c