posix-timers: Preserve return value in clock_adjtime32()
commit2d036dfa5f
upstream. 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:3a4d44b616
("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 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
2ae7a44069
commit
9fbf44e7df
|
@ -1172,8 +1172,8 @@ COMPAT_SYSCALL_DEFINE2(clock_adjtime, clockid_t, which_clock,
|
||||||
|
|
||||||
err = kc->clock_adj(which_clock, &ktx);
|
err = kc->clock_adj(which_clock, &ktx);
|
||||||
|
|
||||||
if (err >= 0)
|
if (err >= 0 && compat_put_timex(utp, &ktx))
|
||||||
err = compat_put_timex(utp, &ktx);
|
return -EFAULT;
|
||||||
|
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue