summaryrefslogtreecommitdiff
path: root/kernel/time
diff options
context:
space:
mode:
authorChen Jun <chenjun102@huawei.com>2021-04-14 03:04:49 +0000
committerThomas Gleixner <tglx@linutronix.de>2021-04-17 14:55:06 +0200
commit2d036dfa5f10df9782f5278fc591d79d283c1fad (patch)
treead7c48f311a6b61e3a4dbeeaff7c50b834074af7 /kernel/time
parent9c336c9935cff267470bb3aaa85c66fac194b650 (diff)
posix-timers: Preserve return value in clock_adjtime32()
The return value on success (>= 0) is overwritten by the return value of put_old_timex32(). That works correct in the fault case, but is wrong for the success case where put_old_timex32() returns 0. Just check the return value of put_old_timex32() and return -EFAULT in case it is not zero. [ tglx: Massage changelog ] Fixes: 3a4d44b61625 ("ntp: Move adjtimex related compat syscalls to native counterparts") Signed-off-by: Chen Jun <chenjun102@huawei.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Richard Cochran <richardcochran@gmail.com> Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20210414030449.90692-1-chenjun102@huawei.com
Diffstat (limited to 'kernel/time')
-rw-r--r--kernel/time/posix-timers.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
index bf540f5a4115..dd5697d7347b 100644
--- a/kernel/time/posix-timers.c
+++ b/kernel/time/posix-timers.c
@@ -1191,8 +1191,8 @@ SYSCALL_DEFINE2(clock_adjtime32, clockid_t, which_clock,
err = do_clock_adjtime(which_clock, &ktx);
- if (err >= 0)
- err = put_old_timex32(utp, &ktx);
+ if (err >= 0 && put_old_timex32(utp, &ktx))
+ return -EFAULT;
return err;
}