diff options
| author | Mark Brown <broonie@kernel.org> | 2015-01-24 11:54:15 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-24 11:54:15 +0000 |
| commit | 93510b46df6de7db4ca3f116ac1386b24d120566 (patch) | |
| tree | 8fb61f128c11c3208721db79204fb3e170c4beb6 /arch/arm64/kernel/ptrace.c | |
| parent | eb72e852c75d21ed6781027f0e3976bb7bd29f08 (diff) | |
| parent | 15f82fce54b86e159fe5a1d41dcdc89e12b26459 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-rtlsk-v3.10-rt-15.01
Diffstat (limited to 'arch/arm64/kernel/ptrace.c')
| -rw-r--r-- | arch/arm64/kernel/ptrace.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c index 8ba6b0fa1753..5cafe0e40cfa 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -660,8 +660,10 @@ static int compat_gpr_get(struct task_struct *target, kbuf += sizeof(reg); } else { ret = copy_to_user(ubuf, ®, sizeof(reg)); - if (ret) + if (ret) { + ret = -EFAULT; break; + } ubuf += sizeof(reg); } @@ -699,8 +701,10 @@ static int compat_gpr_set(struct task_struct *target, kbuf += sizeof(reg); } else { ret = copy_from_user(®, ubuf, sizeof(reg)); - if (ret) - return ret; + if (ret) { + ret = -EFAULT; + break; + } ubuf += sizeof(reg); } |