Commit 9486b8c7 authored by Will Deacon's avatar Will Deacon Committed by Greg Kroah-Hartman

arm64: ptrace: fix compat hardware watchpoint reporting

commit 27d7ff27 upstream.

I'm not sure what I was on when I wrote this, but when iterating over
the hardware watchpoint array (hbp_watch_array), our index is off by
ARM_MAX_BRP, so we walk off the end of our thread_struct...

... except, a dodgy condition in the loop means that it never executes
at all (bp cannot be NULL).

This patch fixes the code so that we remove the bp check and use the
correct index for accessing the watchpoint structures.
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 599f831a
...@@ -79,7 +79,6 @@ static inline void decode_ctrl_reg(u32 reg, ...@@ -79,7 +79,6 @@ static inline void decode_ctrl_reg(u32 reg,
*/ */
#define ARM_MAX_BRP 16 #define ARM_MAX_BRP 16
#define ARM_MAX_WRP 16 #define ARM_MAX_WRP 16
#define ARM_MAX_HBP_SLOTS (ARM_MAX_BRP + ARM_MAX_WRP)
/* Virtual debug register bases. */ /* Virtual debug register bases. */
#define AARCH64_DBG_REG_BVR 0 #define AARCH64_DBG_REG_BVR 0
......
...@@ -85,7 +85,8 @@ static void ptrace_hbptriggered(struct perf_event *bp, ...@@ -85,7 +85,8 @@ static void ptrace_hbptriggered(struct perf_event *bp,
break; break;
} }
} }
for (i = ARM_MAX_BRP; i < ARM_MAX_HBP_SLOTS && !bp; ++i) {
for (i = 0; i < ARM_MAX_WRP; ++i) {
if (current->thread.debug.hbp_watch[i] == bp) { if (current->thread.debug.hbp_watch[i] == bp) {
info.si_errno = -((i << 1) + 1); info.si_errno = -((i << 1) + 1);
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment