Commit f0dbe81f authored Jan 11, 2013 by Miroslav Lichvar Committed by John Stultz Jan 15, 2013

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>

parent 2353b47b

kernel/posix-timers.c

+1 −1

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

Admin message