]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
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)
committerCatalin Marinas <catalin.marinas@arm.com>
Fri, 1 Mar 2019 16:23:17 +0000 (16:23 +0000)
commitb9a4b9d084d978f80eb9210727c81804588b42ff
treefcaf5289b28a6782441211facb51f65d02f1f196
parent3cd0ddb3deec43bd1cfcdd39d3dde37a0135d0c6
arm64: debug: Don't propagate UNKNOWN FAR into si_code for debug signals

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