Skip to content

Commit 7a35397

Browse files
deepa-hubarndb
deepa-hub
authored and
arndb
committed
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: Deepa Dinamani <deepa.kernel@gmail.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1 parent e024707 commit 7a35397

File tree

3 files changed

+95
-5
lines changed

3 files changed

+95
-5
lines changed

‎fs/aio.c

Lines changed: 81 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2062,11 +2062,13 @@ static long do_io_getevents(aio_context_t ctx_id,
20622062
* specifies an infinite timeout. Note that the timeout pointed to by
20632063
* timeout is relative. Will fail with -ENOSYS if not implemented.
20642064
*/
2065+
#if !defined(CONFIG_64BIT_TIME) || defined(CONFIG_64BIT)
2066+
20652067
SYSCALL_DEFINE5(io_getevents, aio_context_t, ctx_id,
20662068
long, min_nr,
20672069
long, nr,
20682070
struct io_event __user *, events,
2069-
struct timespec __user *, timeout)
2071+
struct __kernel_timespec __user *, timeout)
20702072
{
20712073
struct timespec64 ts;
20722074
int ret;
@@ -2080,6 +2082,8 @@ SYSCALL_DEFINE5(io_getevents, aio_context_t, ctx_id,
20802082
return ret;
20812083
}
20822084

2085+
#endif
2086+
20832087
struct __aio_sigset {
20842088
const sigset_t __user *sigmask;
20852089
size_t sigsetsize;
@@ -2090,7 +2094,7 @@ SYSCALL_DEFINE6(io_pgetevents,
20902094
long, min_nr,
20912095
long, nr,
20922096
struct io_event __user *, events,
2093-
struct timespec __user *, timeout,
2097+
struct __kernel_timespec __user *, timeout,
20942098
const struct __aio_sigset __user *, usig)
20952099
{
20962100
struct __aio_sigset ksig = { NULL, };
@@ -2104,6 +2108,39 @@ SYSCALL_DEFINE6(io_pgetevents,
21042108
if (usig && copy_from_user(&ksig, usig, sizeof(ksig)))
21052109
return -EFAULT;
21062110

2111+
ret = set_user_sigmask(ksig.sigmask, &ksigmask, &sigsaved, ksig.sigsetsize);
2112+
if (ret)
2113+
return ret;
2114+
2115+
ret = do_io_getevents(ctx_id, min_nr, nr, events, timeout ? &ts : NULL);
2116+
restore_user_sigmask(ksig.sigmask, &sigsaved);
2117+
if (signal_pending(current) && !ret)
2118+
ret = -ERESTARTNOHAND;
2119+
2120+
return ret;
2121+
}
2122+
2123+
#if defined(CONFIG_COMPAT_32BIT_TIME) && !defined(CONFIG_64BIT)
2124+
2125+
SYSCALL_DEFINE6(io_pgetevents_time32,
2126+
aio_context_t, ctx_id,
2127+
long, min_nr,
2128+
long, nr,
2129+
struct io_event __user *, events,
2130+
struct old_timespec32 __user *, timeout,
2131+
const struct __aio_sigset __user *, usig)
2132+
{
2133+
struct __aio_sigset ksig = { NULL, };
2134+
sigset_t ksigmask, sigsaved;
2135+
struct timespec64 ts;
2136+
int ret;
2137+
2138+
if (timeout && unlikely(get_old_timespec32(&ts, timeout)))
2139+
return -EFAULT;
2140+
2141+
if (usig && copy_from_user(&ksig, usig, sizeof(ksig)))
2142+
return -EFAULT;
2143+
21072144

21082145
ret = set_user_sigmask(ksig.sigmask, &ksigmask, &sigsaved, ksig.sigsetsize);
21092146
if (ret)
@@ -2117,7 +2154,10 @@ SYSCALL_DEFINE6(io_pgetevents,
21172154
return ret;
21182155
}
21192156

2120-
#ifdef CONFIG_COMPAT
2157+
#endif
2158+
2159+
#if defined(CONFIG_COMPAT_32BIT_TIME)
2160+
21212161
COMPAT_SYSCALL_DEFINE5(io_getevents, compat_aio_context_t, ctx_id,
21222162
compat_long_t, min_nr,
21232163
compat_long_t, nr,
@@ -2136,12 +2176,17 @@ COMPAT_SYSCALL_DEFINE5(io_getevents, compat_aio_context_t, ctx_id,
21362176
return ret;
21372177
}
21382178

2179+
#endif
2180+
2181+
#ifdef CONFIG_COMPAT
21392182

21402183
struct __compat_aio_sigset {
21412184
compat_sigset_t __user *sigmask;
21422185
compat_size_t sigsetsize;
21432186
};
21442187

2188+
#if defined(CONFIG_COMPAT_32BIT_TIME)
2189+
21452190
COMPAT_SYSCALL_DEFINE6(io_pgetevents,
21462191
compat_aio_context_t, ctx_id,
21472192
compat_long_t, min_nr,
@@ -2172,4 +2217,37 @@ COMPAT_SYSCALL_DEFINE6(io_pgetevents,
21722217

21732218
return ret;
21742219
}
2220+
2221+
#endif
2222+
2223+
COMPAT_SYSCALL_DEFINE6(io_pgetevents_time64,
2224+
compat_aio_context_t, ctx_id,
2225+
compat_long_t, min_nr,
2226+
compat_long_t, nr,
2227+
struct io_event __user *, events,
2228+
struct __kernel_timespec __user *, timeout,
2229+
const struct __compat_aio_sigset __user *, usig)
2230+
{
2231+
struct __compat_aio_sigset ksig = { NULL, };
2232+
sigset_t ksigmask, sigsaved;
2233+
struct timespec64 t;
2234+
int ret;
2235+
2236+
if (timeout && get_timespec64(&t, timeout))
2237+
return -EFAULT;
2238+
2239+
if (usig && copy_from_user(&ksig, usig, sizeof(ksig)))
2240+
return -EFAULT;
2241+
2242+
ret = set_compat_user_sigmask(ksig.sigmask, &ksigmask, &sigsaved, ksig.sigsetsize);
2243+
if (ret)
2244+
return ret;
2245+
2246+
ret = do_io_getevents(ctx_id, min_nr, nr, events, timeout ? &t : NULL);
2247+
restore_user_sigmask(ksig.sigmask, &sigsaved);
2248+
if (signal_pending(current) && !ret)
2249+
ret = -ERESTARTNOHAND;
2250+
2251+
return ret;
2252+
}
21752253
#endif

‎include/linux/compat.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -562,6 +562,12 @@ asmlinkage long compat_sys_io_pgetevents(compat_aio_context_t ctx_id,
562562
struct io_event __user *events,
563563
struct old_timespec32 __user *timeout,
564564
const struct __compat_aio_sigset __user *usig);
565+
asmlinkage long compat_sys_io_pgetevents_time64(compat_aio_context_t ctx_id,
566+
compat_long_t min_nr,
567+
compat_long_t nr,
568+
struct io_event __user *events,
569+
struct __kernel_timespec __user *timeout,
570+
const struct __compat_aio_sigset __user *usig);
565571

566572
/* fs/cookies.c */
567573
asmlinkage long compat_sys_lookup_dcookie(u32, u32, char __user *, compat_size_t);

‎include/linux/syscalls.h

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,12 +296,18 @@ asmlinkage long sys_io_getevents(aio_context_t ctx_id,
296296
long min_nr,
297297
long nr,
298298
struct io_event __user *events,
299-
struct timespec __user *timeout);
299+
struct __kernel_timespec __user *timeout);
300300
asmlinkage long sys_io_pgetevents(aio_context_t ctx_id,
301301
long min_nr,
302302
long nr,
303303
struct io_event __user *events,
304-
struct timespec __user *timeout,
304+
struct __kernel_timespec __user *timeout,
305+
const struct __aio_sigset *sig);
306+
asmlinkage long sys_io_pgetevents_time32(aio_context_t ctx_id,
307+
long min_nr,
308+
long nr,
309+
struct io_event __user *events,
310+
struct old_timespec32 __user *timeout,
305311
const struct __aio_sigset *sig);
306312

307313
/* fs/xattr.c */

0 commit comments

Comments
 (0)