diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-20 13:50:08 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-20 13:50:08 -0800 |
| commit | a81ce79bf294bf61fd3069abdb0923598615da84 (patch) | |
| tree | b3137fbeda278343747bfc0b0ed4259ec9106079 /arch | |
| parent | df36ac1bc2a166eef90785d584e4cfed6f52bd32 (diff) | |
| parent | cdc27c27843248ae7eb0df5fc261dd004eaa5670 (diff) | |
| download | linux-stable-a81ce79bf294bf61fd3069abdb0923598615da84.tar.gz linux-stable-a81ce79bf294bf61fd3069abdb0923598615da84.tar.bz2 linux-stable-a81ce79bf294bf61fd3069abdb0923598615da84.zip | |
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 ptrace fix from Catalin Marinas.
* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
arm64: ptrace: avoid using HW_BREAKPOINT_EMPTY for disabled events
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/kernel/ptrace.c | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c index 6777a2192b83..6a8928bba03c 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -214,31 +214,29 @@ static int ptrace_hbp_fill_attr_ctrl(unsigned int note_type, { int err, len, type, disabled = !ctrl.enabled; - if (disabled) { - len = 0; - type = HW_BREAKPOINT_EMPTY; - } else { - err = arch_bp_generic_fields(ctrl, &len, &type); - if (err) - return err; - - switch (note_type) { - case NT_ARM_HW_BREAK: - if ((type & HW_BREAKPOINT_X) != type) - return -EINVAL; - break; - case NT_ARM_HW_WATCH: - if ((type & HW_BREAKPOINT_RW) != type) - return -EINVAL; - break; - default: + attr->disabled = disabled; + if (disabled) + return 0; + + err = arch_bp_generic_fields(ctrl, &len, &type); + if (err) + return err; + + switch (note_type) { + case NT_ARM_HW_BREAK: + if ((type & HW_BREAKPOINT_X) != type) return -EINVAL; - } + break; + case NT_ARM_HW_WATCH: + if ((type & HW_BREAKPOINT_RW) != type) + return -EINVAL; + break; + default: + return -EINVAL; } attr->bp_len = len; attr->bp_type = type; - attr->disabled = disabled; return 0; } |