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

Commit 7a35397f authored by Deepa Dinamani's avatar Deepa Dinamani Committed by Arnd Bergmann
Browse files

io_pgetevents: use __kernel_timespec 



struct timespec is not y2038 safe.
struct __kernel_timespec is the new y2038 safe structure for all
syscalls that are using struct timespec.
Update io_pgetevents interfaces to use struct __kernel_timespec.

sigset_t also has different representations on 32 bit and 64 bit
architectures. Hence, we need to support the following different
syscalls:

New y2038 safe syscalls:
(Controlled by CONFIG_64BIT_TIME for 32 bit ABIs)

Native 64 bit(unchanged) and native 32 bit : sys_io_pgetevents
Compat : compat_sys_io_pgetevents_time64

Older y2038 unsafe syscalls:
(Controlled by CONFIG_32BIT_COMPAT_TIME for 32 bit ABIs)

Native 32 bit : sys_io_pgetevents_time32
Compat : compat_sys_io_pgetevents

Note that io_getevents syscalls do not have a y2038 safe solution.

Signed-off-by: default avatarDeepa Dinamani <deepa.kernel@gmail.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent e024707b

fs/aio.c

+81 −3
Original line number Diff line number Diff line
@@ -2062,11 +2062,13 @@ static long do_io_getevents(aio_context_t ctx_id, 
 *	specifies an infinite timeout. Note that the timeout pointed to by

 *	timeout is relative.  Will fail with -ENOSYS if not implemented.

 */

#if !defined(CONFIG_64BIT_TIME) || defined(CONFIG_64BIT)



SYSCALL_DEFINE5(io_getevents, aio_context_t, ctx_id,

		long, min_nr,

		long, nr,

		struct io_event __user *, events,

		struct timespec __user *, timeout)

		struct __kernel_timespec __user *, timeout)

{

	struct timespec64	ts;

	int			ret;
@@ -2080,6 +2082,8 @@ SYSCALL_DEFINE5(io_getevents, aio_context_t, ctx_id, 
	return ret;

}



#endif



struct __aio_sigset {

	const sigset_t __user	*sigmask;

	size_t		sigsetsize;
@@ -2090,7 +2094,7 @@ SYSCALL_DEFINE6(io_pgetevents, 
		long, min_nr,

		long, nr,

		struct io_event __user *, events,

		struct timespec __user *, timeout,

		struct __kernel_timespec __user *, timeout,

		const struct __aio_sigset __user *, usig)

{

	struct __aio_sigset	ksig = { NULL, };
@@ -2104,6 +2108,39 @@ SYSCALL_DEFINE6(io_pgetevents, 
	if (usig && copy_from_user(&ksig, usig, sizeof(ksig)))

		return -EFAULT;



	ret = set_user_sigmask(ksig.sigmask, &ksigmask, &sigsaved, ksig.sigsetsize);

	if (ret)

		return ret;



	ret = do_io_getevents(ctx_id, min_nr, nr, events, timeout ? &ts : NULL);

	restore_user_sigmask(ksig.sigmask, &sigsaved);

	if (signal_pending(current) && !ret)

		ret = -ERESTARTNOHAND;



	return ret;

}



#if defined(CONFIG_COMPAT_32BIT_TIME) && !defined(CONFIG_64BIT)



SYSCALL_DEFINE6(io_pgetevents_time32,

		aio_context_t, ctx_id,

		long, min_nr,

		long, nr,

		struct io_event __user *, events,

		struct old_timespec32 __user *, timeout,

		const struct __aio_sigset __user *, usig)

{

	struct __aio_sigset	ksig = { NULL, };

	sigset_t		ksigmask, sigsaved;

	struct timespec64	ts;

	int ret;



	if (timeout && unlikely(get_old_timespec32(&ts, timeout)))

		return -EFAULT;



	if (usig && copy_from_user(&ksig, usig, sizeof(ksig)))

		return -EFAULT;





	ret = set_user_sigmask(ksig.sigmask, &ksigmask, &sigsaved, ksig.sigsetsize);

	if (ret)
@@ -2117,7 +2154,10 @@ SYSCALL_DEFINE6(io_pgetevents, 
	return ret;

}



#ifdef CONFIG_COMPAT

#endif



#if defined(CONFIG_COMPAT_32BIT_TIME)



COMPAT_SYSCALL_DEFINE5(io_getevents, compat_aio_context_t, ctx_id,

		       compat_long_t, min_nr,

		       compat_long_t, nr,
@@ -2136,12 +2176,17 @@ COMPAT_SYSCALL_DEFINE5(io_getevents, compat_aio_context_t, ctx_id, 
	return ret;

}



#endif



#ifdef CONFIG_COMPAT



struct __compat_aio_sigset {

	compat_sigset_t __user	*sigmask;

	compat_size_t		sigsetsize;

};



#if defined(CONFIG_COMPAT_32BIT_TIME)



COMPAT_SYSCALL_DEFINE6(io_pgetevents,

		compat_aio_context_t, ctx_id,

		compat_long_t, min_nr,
@@ -2172,4 +2217,37 @@ COMPAT_SYSCALL_DEFINE6(io_pgetevents, 


	return ret;

}



#endif



COMPAT_SYSCALL_DEFINE6(io_pgetevents_time64,

		compat_aio_context_t, ctx_id,

		compat_long_t, min_nr,

		compat_long_t, nr,

		struct io_event __user *, events,

		struct __kernel_timespec __user *, timeout,

		const struct __compat_aio_sigset __user *, usig)

{

	struct __compat_aio_sigset ksig = { NULL, };

	sigset_t ksigmask, sigsaved;

	struct timespec64 t;

	int ret;



	if (timeout && get_timespec64(&t, timeout))

		return -EFAULT;



	if (usig && copy_from_user(&ksig, usig, sizeof(ksig)))

		return -EFAULT;



	ret = set_compat_user_sigmask(ksig.sigmask, &ksigmask, &sigsaved, ksig.sigsetsize);

	if (ret)

		return ret;



	ret = do_io_getevents(ctx_id, min_nr, nr, events, timeout ? &t : NULL);

	restore_user_sigmask(ksig.sigmask, &sigsaved);

	if (signal_pending(current) && !ret)

		ret = -ERESTARTNOHAND;



	return ret;

}

#endif

include/linux/compat.h

+6 −0
Original line number Diff line number Diff line
@@ -562,6 +562,12 @@ asmlinkage long compat_sys_io_pgetevents(compat_aio_context_t ctx_id, 
					struct io_event __user *events,

					struct old_timespec32 __user *timeout,

					const struct __compat_aio_sigset __user *usig);

asmlinkage long compat_sys_io_pgetevents_time64(compat_aio_context_t ctx_id,

					compat_long_t min_nr,

					compat_long_t nr,

					struct io_event __user *events,

					struct __kernel_timespec __user *timeout,

					const struct __compat_aio_sigset __user *usig);



/* fs/cookies.c */

asmlinkage long compat_sys_lookup_dcookie(u32, u32, char __user *, compat_size_t);

include/linux/syscalls.h

+8 −2
Original line number Diff line number Diff line
@@ -296,12 +296,18 @@ asmlinkage long sys_io_getevents(aio_context_t ctx_id, 
				long min_nr,

				long nr,

				struct io_event __user *events,

				struct timespec __user *timeout);

				struct __kernel_timespec __user *timeout);

asmlinkage long sys_io_pgetevents(aio_context_t ctx_id,

				long min_nr,

				long nr,

				struct io_event __user *events,

				struct timespec __user *timeout,

				struct __kernel_timespec __user *timeout,

				const struct __aio_sigset *sig);

asmlinkage long sys_io_pgetevents_time32(aio_context_t ctx_id,

				long min_nr,

				long nr,

				struct io_event __user *events,

				struct old_timespec32 __user *timeout,

				const struct __aio_sigset *sig);



/* fs/xattr.c */