forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

arm64: ptrace: fix compat hardware watchpoint reporting

Browse source 
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.

Cc: <stable@vger.kernel.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
This commit is contained in:
Will Deacon 2014-08-22 14:13:24 +01:00
commit 27d7ff273c
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
arch/arm64/include/asm/hw_breakpoint.h
View file

@ -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

3
arch/arm64/kernel/ptrace.c
View file

@ -87,7 +87,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;