nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

arm64: hw_breakpoint: fix watchpoint matching for tagged pointers

Browse source 
When we take a watchpoint exception, the address that triggered the
watchpoint is found in FAR_EL1. We compare it to the address of each
configured watchpoint to see which one was hit.

The configured watchpoint addresses are untagged, while the address in
FAR_EL1 will have an address tag if the data access was done using a
tagged address. The tag needs to be removed to compare the address to
the watchpoints.

Currently we don't remove it, and as a result can report the wrong
watchpoint as being hit (specifically, always either the highest TTBR0
watchpoint or lowest TTBR1 watchpoint). This patch removes the tag.

Fixes: d50240a5f6 ("arm64: mm: permit use of tagged pointers at EL0")
Cc: <stable@vger.kernel.org> # 3.12.x-
Acked-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Kristina Martsenko <kristina.martsenko@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
This commit is contained in:
Kristina Martsenko 2017-05-03 16:37:46 +01:00 committed by Catalin Marinas
parent 81cddd65b5
commit 7dcd9dd8ce
2 changed files with 6 additions and 3 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

6
arch/arm64/include/asm/uaccess.h
View file

@ -106,9 +106,9 @@ static inline void set_fs(mm_segment_t fs)
}) })
/* /*
* When dealing with data aborts or instruction traps we may end up with * When dealing with data aborts, watchpoints, or instruction traps we may end
* a tagged userland pointer. Clear the tag to get a sane pointer to pass * up with a tagged userland pointer. Clear the tag to get a sane pointer to
* on to access_ok(), for instance. * pass on to access_ok(), for instance.
*/ */
#define untagged_addr(addr) sign_extend64(addr, 55) #define untagged_addr(addr) sign_extend64(addr, 55)

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

@ -36,6 +36,7 @@
#include <asm/traps.h> #include <asm/traps.h>
#include <asm/cputype.h> #include <asm/cputype.h>
#include <asm/system_misc.h> #include <asm/system_misc.h>
#include <asm/uaccess.h>
/* Breakpoint currently in use for each BRP. */ /* Breakpoint currently in use for each BRP. */
static DEFINE_PER_CPU(struct perf_event *, bp_on_reg[ARM_MAX_BRP]); static DEFINE_PER_CPU(struct perf_event *, bp_on_reg[ARM_MAX_BRP]);
@ -721,6 +722,8 @@ static u64 get_distance_from_watchpoint(unsigned long addr, u64 val,
u64 wp_low, wp_high; u64 wp_low, wp_high;
u32 lens, lene; u32 lens, lene;
addr = untagged_addr(addr);
lens = __ffs(ctrl->len); lens = __ffs(ctrl->len);
lene = __fls(ctrl->len); lene = __fls(ctrl->len);