diff options
| author | Will Deacon <will@kernel.org> | 2019-07-29 12:06:17 +0200 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2019-07-29 12:06:17 +0200 |
| commit | 849adec41203ac5837c40c2d7e08490ffdef3c2c (patch) | |
| tree | 07a2376b7c640a8c780a05c62c4a2a894b1851f4 /arch | |
| parent | Linux 5.3-rc2 (diff) | |
| download | linux-849adec41203ac5837c40c2d7e08490ffdef3c2c.tar.xz linux-849adec41203ac5837c40c2d7e08490ffdef3c2c.zip | |
arm64: compat: Allow single-byte watchpoints on all addresses
Commit d968d2b801d8 ("ARM: 7497/1: hw_breakpoint: allow single-byte
watchpoints on all addresses") changed the validation requirements for
hardware watchpoints on arch/arm/. Update our compat layer to implement
the same relaxation.
Cc: <stable@vger.kernel.org>
Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/kernel/hw_breakpoint.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm64/kernel/hw_breakpoint.c b/arch/arm64/kernel/hw_breakpoint.c index dceb84520948..67b3bae50b92 100644 --- a/arch/arm64/kernel/hw_breakpoint.c +++ b/arch/arm64/kernel/hw_breakpoint.c @@ -536,13 +536,14 @@ int hw_breakpoint_arch_parse(struct perf_event *bp, /* Aligned */ break; case 1: - /* Allow single byte watchpoint. */ - if (hw->ctrl.len == ARM_BREAKPOINT_LEN_1) - break; case 2: /* Allow halfword watchpoints and breakpoints. */ if (hw->ctrl.len == ARM_BREAKPOINT_LEN_2) break; + case 3: + /* Allow single byte watchpoint. */ + if (hw->ctrl.len == ARM_BREAKPOINT_LEN_1) + break; default: return -EINVAL; } |