Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b2d0285 authored by Al Viro's avatar Al Viro Committed by Thomas Gleixner
Browse files

time: Move compat_gettimeofday()/settimeofday() to native 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20170607084241.28657-16-viro@ZenIV.linux.org.uk
parent b180db2c

kernel/compat.c

+0 −38
Original line number Diff line number Diff line
@@ -92,44 +92,6 @@ int compat_put_timex(struct compat_timex __user *utp, const struct timex *txc) 
	return 0;

}



COMPAT_SYSCALL_DEFINE2(gettimeofday, struct compat_timeval __user *, tv,

		       struct timezone __user *, tz)

{

	if (tv) {

		struct timeval ktv;

		do_gettimeofday(&ktv);

		if (compat_put_timeval(&ktv, tv))

			return -EFAULT;

	}

	if (tz) {

		if (copy_to_user(tz, &sys_tz, sizeof(sys_tz)))

			return -EFAULT;

	}



	return 0;

}



COMPAT_SYSCALL_DEFINE2(settimeofday, struct compat_timeval __user *, tv,

		       struct timezone __user *, tz)

{

	struct timespec64 new_ts;

	struct timeval user_tv;

	struct timezone new_tz;



	if (tv) {

		if (compat_get_timeval(&user_tv, tv))

			return -EFAULT;

		new_ts.tv_sec = user_tv.tv_sec;

		new_ts.tv_nsec = user_tv.tv_usec * NSEC_PER_USEC;

	}

	if (tz) {

		if (copy_from_user(&new_tz, tz, sizeof(*tz)))

			return -EFAULT;

	}



	return do_sys_settimeofday64(tv ? &new_ts : NULL, tz ? &new_tz : NULL);

}



static int __compat_get_timeval(struct timeval *tv, const struct compat_timeval __user *ctv)

{

	return (!access_ok(VERIFY_READ, ctv, sizeof(*ctv)) ||

kernel/time/time.c

+41 −0
Original line number Diff line number Diff line
@@ -257,6 +257,47 @@ SYSCALL_DEFINE2(settimeofday, struct timeval __user *, tv, 
	return do_sys_settimeofday64(tv ? &new_ts : NULL, tz ? &new_tz : NULL);

}



#ifdef CONFIG_COMPAT

COMPAT_SYSCALL_DEFINE2(gettimeofday, struct compat_timeval __user *, tv,

		       struct timezone __user *, tz)

{

	if (tv) {

		struct timeval ktv;



		do_gettimeofday(&ktv);

		if (compat_put_timeval(&ktv, tv))

			return -EFAULT;

	}

	if (tz) {

		if (copy_to_user(tz, &sys_tz, sizeof(sys_tz)))

			return -EFAULT;

	}



	return 0;

}



COMPAT_SYSCALL_DEFINE2(settimeofday, struct compat_timeval __user *, tv,

		       struct timezone __user *, tz)

{

	struct timespec64 new_ts;

	struct timeval user_tv;

	struct timezone new_tz;



	if (tv) {

		if (compat_get_timeval(&user_tv, tv))

			return -EFAULT;

		new_ts.tv_sec = user_tv.tv_sec;

		new_ts.tv_nsec = user_tv.tv_usec * NSEC_PER_USEC;

	}

	if (tz) {

		if (copy_from_user(&new_tz, tz, sizeof(*tz)))

			return -EFAULT;

	}



	return do_sys_settimeofday64(tv ? &new_ts : NULL, tz ? &new_tz : NULL);

}

#endif



SYSCALL_DEFINE1(adjtimex, struct timex __user *, txc_p)

{

	struct timex txc;		/* Local copy of parameter */