summaryrefslogtreecommitdiffstats
path: root/kernel/posix-timers.c
diff options
context:
space:
mode:
authorMiroslav Lichvar <mlichvar@redhat.com>2013-01-11 11:58:58 +0100
committerJohn Stultz <john.stultz@linaro.org>2013-01-15 18:16:07 -0800
commitf0dbe81f0e7c39783ad25d9084bbcda131508993 (patch)
treec88ba1416dfb90fce3ed0a72c4bf5bfb42831988 /kernel/posix-timers.c
parent2353b47bffe4e6ab39042f470c55d41bb3ff3846 (diff)
downloadlinux-f0dbe81f0e7c39783ad25d9084bbcda131508993.tar.bz2
posix-timers: Fix clock_adjtime to always return timex data on success
The clock_adj call returns the clock state on success, which may be a non-zero value (e.g. TIME_INS), but the modified timex data is copied back to the user only when zero value (TIME_OK) was returned. Fix the condition to copy the data also with positive return values. Signed-off-by: Miroslav Lichvar <mlichvar@redhat.com> Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'kernel/posix-timers.c')
-rw-r--r--kernel/posix-timers.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
index 69185ae6b701..10349d5f2ec3 100644
--- a/kernel/posix-timers.c
+++ b/kernel/posix-timers.c
@@ -997,7 +997,7 @@ SYSCALL_DEFINE2(clock_adjtime, const clockid_t, which_clock,
err = kc->clock_adj(which_clock, &ktx);
- if (!err && copy_to_user(utx, &ktx, sizeof(ktx)))
+ if (err >= 0 && copy_to_user(utx, &ktx, sizeof(ktx)))
return -EFAULT;
return err;