Commit 2d036dfa authored by Chen Jun's avatar Chen Jun Committed by Thomas Gleixner
Browse files

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: 3a4d44b6 ("ntp: Move adjtimex related compat syscalls to native counterparts")
Signed-off-by: default avatarChen Jun <chenjun102@huawei.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarRichard Cochran <richardcochran@gmail.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20210414030449.90692-1-chenjun102@huawei.com
parent 9c336c99

kernel/time/posix-timers.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

}