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

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

time: Move compat_time()/stime() 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-15-viro@ZenIV.linux.org.uk
parent 2482097c

kernel/compat.c

+0 −40
Original line number Diff line number Diff line
@@ -739,46 +739,6 @@ COMPAT_SYSCALL_DEFINE4(rt_sigtimedwait, compat_sigset_t __user *, uthese, 
	return ret;

}



#ifdef __ARCH_WANT_COMPAT_SYS_TIME



/* compat_time_t is a 32 bit "long" and needs to get converted. */



COMPAT_SYSCALL_DEFINE1(time, compat_time_t __user *, tloc)

{

	compat_time_t i;

	struct timeval tv;



	do_gettimeofday(&tv);

	i = tv.tv_sec;



	if (tloc) {

		if (put_user(i,tloc))

			return -EFAULT;

	}

	force_successful_syscall_return();

	return i;

}



COMPAT_SYSCALL_DEFINE1(stime, compat_time_t __user *, tptr)

{

	struct timespec tv;

	int err;



	if (get_user(tv.tv_sec, tptr))

		return -EFAULT;



	tv.tv_nsec = 0;



	err = security_settime(&tv, NULL);

	if (err)

		return err;



	do_settimeofday(&tv);

	return 0;

}



#endif /* __ARCH_WANT_COMPAT_SYS_TIME */



#ifdef CONFIG_NUMA

COMPAT_SYSCALL_DEFINE6(move_pages, pid_t, pid, compat_ulong_t, nr_pages,

		       compat_uptr_t __user *, pages32,

kernel/time/time.c

+41 −0
Original line number Diff line number Diff line
@@ -100,6 +100,47 @@ SYSCALL_DEFINE1(stime, time_t __user *, tptr) 


#endif /* __ARCH_WANT_SYS_TIME */



#ifdef CONFIG_COMPAT

#ifdef __ARCH_WANT_COMPAT_SYS_TIME



/* compat_time_t is a 32 bit "long" and needs to get converted. */

COMPAT_SYSCALL_DEFINE1(time, compat_time_t __user *, tloc)

{

	struct timeval tv;

	compat_time_t i;



	do_gettimeofday(&tv);

	i = tv.tv_sec;



	if (tloc) {

		if (put_user(i,tloc))

			return -EFAULT;

	}

	force_successful_syscall_return();

	return i;

}



COMPAT_SYSCALL_DEFINE1(stime, compat_time_t __user *, tptr)

{

	struct timespec tv;

	int err;



	if (get_user(tv.tv_sec, tptr))

		return -EFAULT;



	tv.tv_nsec = 0;



	err = security_settime(&tv, NULL);

	if (err)

		return err;



	do_settimeofday(&tv);

	return 0;

}



#endif /* __ARCH_WANT_COMPAT_SYS_TIME */

#endif



SYSCALL_DEFINE2(gettimeofday, struct timeval __user *, tv,

		struct timezone __user *, tz)

{