| Message ID | 20191108210824.1534248-1-arnd@arndb.de |
|---|---|
| State | Accepted |
| Commit | 3ca47e958a64b1116a2c35e65dcf467fc53d52de |
| Headers | show |
| Series | y2038 cleanups | expand |
On Fri, 2019-11-08 at 22:07 +0100, Arnd Bergmann wrote: [...] > --- a/kernel/time/time.c > +++ b/kernel/time/time.c > @@ -267,7 +267,7 @@ COMPAT_SYSCALL_DEFINE2(settimeofday, struct old_timeval32 __user *, tv, > } > #endif > > -#if !defined(CONFIG_64BIT_TIME) || defined(CONFIG_64BIT) > +#ifdef CONFIG_64BIT > SYSCALL_DEFINE1(adjtimex, struct __kernel_timex __user *, txc_p) > { > struct __kernel_timex txc; /* Local copy of parameter */ > @@ -884,7 +884,7 @@ int get_timespec64(struct timespec64 *ts, > ts->tv_sec = kts.tv_sec; > > /* Zero out the padding for 32 bit systems or in compat mode */ > - if (IS_ENABLED(CONFIG_64BIT_TIME) && in_compat_syscall()) > + if (in_compat_syscall()) > kts.tv_nsec &= 0xFFFFFFFFUL; > > ts->tv_nsec = kts.tv_nsec; [...] It's not a problem with this patch, but I noticed that this condition doesn't match what the comment says. It looks like it was broken by: commit 98f76206b33504b934209d16196477dfa519a807 Author: Dmitry Safonov <dima@arista.com> Date: Fri Oct 12 14:42:53 2018 +0100 compat: Cleanup in_compat_syscall() callers Ben. -- Ben Hutchings, Software Developer Codethink Ltd https://www.codethink.co.uk/ Dale House, 35 Dale Street Manchester, M1 2HF, United Kingdom
On 11/20/19 10:28 PM, Ben Hutchings wrote: > On Fri, 2019-11-08 at 22:07 +0100, Arnd Bergmann wrote: > [...] >> --- a/kernel/time/time.c >> +++ b/kernel/time/time.c >> @@ -267,7 +267,7 @@ COMPAT_SYSCALL_DEFINE2(settimeofday, struct old_timeval32 __user *, tv, >> } >> #endif >> >> -#if !defined(CONFIG_64BIT_TIME) || defined(CONFIG_64BIT) >> +#ifdef CONFIG_64BIT >> SYSCALL_DEFINE1(adjtimex, struct __kernel_timex __user *, txc_p) >> { >> struct __kernel_timex txc; /* Local copy of parameter */ >> @@ -884,7 +884,7 @@ int get_timespec64(struct timespec64 *ts, >> ts->tv_sec = kts.tv_sec; >> >> /* Zero out the padding for 32 bit systems or in compat mode */ >> - if (IS_ENABLED(CONFIG_64BIT_TIME) && in_compat_syscall()) >> + if (in_compat_syscall()) >> kts.tv_nsec &= 0xFFFFFFFFUL; >> >> ts->tv_nsec = kts.tv_nsec; > [...] > > It's not a problem with this patch, but I noticed that this condition > doesn't match what the comment says. It looks like it was broken by: > > commit 98f76206b33504b934209d16196477dfa519a807 > Author: Dmitry Safonov <dima@arista.com> > Date: Fri Oct 12 14:42:53 2018 +0100 > > compat: Cleanup in_compat_syscall() callers > Ugh, you right. I've failed to read the condition and thought it's related to CONFIG_COMPAT :( I'll send a fix shortly, thanks for spotting this! -- Dmitry
diff --git a/arch/Kconfig b/arch/Kconfig index 5f8a5d84dbbe..0e1fded2940e 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -796,14 +796,6 @@ config OLD_SIGACTION config COMPAT_OLD_SIGACTION bool -config 64BIT_TIME - def_bool y - help - This should be selected by all architectures that need to support - new system calls with a 64-bit time_t. This is relevant on all 32-bit - architectures, and 64-bit architectures as part of compat syscall - handling. - config COMPAT_32BIT_TIME def_bool !64BIT || COMPAT help diff --git a/fs/aio.c b/fs/aio.c index 01e0fb9ae45a..447e3a0c572c 100644 --- a/fs/aio.c +++ b/fs/aio.c @@ -2056,7 +2056,7 @@ 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) +#ifdef CONFIG_64BIT SYSCALL_DEFINE5(io_getevents, aio_context_t, ctx_id, long, min_nr, diff --git a/ipc/syscall.c b/ipc/syscall.c index 581bdff4e7c5..dfb0e988d542 100644 --- a/ipc/syscall.c +++ b/ipc/syscall.c @@ -30,7 +30,7 @@ int ksys_ipc(unsigned int call, int first, unsigned long second, return ksys_semtimedop(first, (struct sembuf __user *)ptr, second, NULL); case SEMTIMEDOP: - if (IS_ENABLED(CONFIG_64BIT) || !IS_ENABLED(CONFIG_64BIT_TIME)) + if (IS_ENABLED(CONFIG_64BIT)) return ksys_semtimedop(first, ptr, second, (const struct __kernel_timespec __user *)fifth); else if (IS_ENABLED(CONFIG_COMPAT_32BIT_TIME)) diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c index 65605530ee34..9e20873148c6 100644 --- a/kernel/time/hrtimer.c +++ b/kernel/time/hrtimer.c @@ -1940,7 +1940,7 @@ long hrtimer_nanosleep(const struct timespec64 *rqtp, return ret; } -#if !defined(CONFIG_64BIT_TIME) || defined(CONFIG_64BIT) +#ifdef CONFIG_64BIT SYSCALL_DEFINE2(nanosleep, struct __kernel_timespec __user *, rqtp, struct __kernel_timespec __user *, rmtp) diff --git a/kernel/time/time.c b/kernel/time/time.c index 45a358953f09..ddbddf504c23 100644 --- a/kernel/time/time.c +++ b/kernel/time/time.c @@ -267,7 +267,7 @@ COMPAT_SYSCALL_DEFINE2(settimeofday, struct old_timeval32 __user *, tv, } #endif -#if !defined(CONFIG_64BIT_TIME) || defined(CONFIG_64BIT) +#ifdef CONFIG_64BIT SYSCALL_DEFINE1(adjtimex, struct __kernel_timex __user *, txc_p) { struct __kernel_timex txc; /* Local copy of parameter */ @@ -884,7 +884,7 @@ int get_timespec64(struct timespec64 *ts, ts->tv_sec = kts.tv_sec; /* Zero out the padding for 32 bit systems or in compat mode */ - if (IS_ENABLED(CONFIG_64BIT_TIME) && in_compat_syscall()) + if (in_compat_syscall()) kts.tv_nsec &= 0xFFFFFFFFUL; ts->tv_nsec = kts.tv_nsec; diff --git a/net/socket.c b/net/socket.c index 6a9ab7a8b1d2..98f6544b0096 100644 --- a/net/socket.c +++ b/net/socket.c @@ -2833,7 +2833,7 @@ SYSCALL_DEFINE2(socketcall, int, call, unsigned long __user *, args) a[2], true); break; case SYS_RECVMMSG: - if (IS_ENABLED(CONFIG_64BIT) || !IS_ENABLED(CONFIG_64BIT_TIME)) + if (IS_ENABLED(CONFIG_64BIT)) err = __sys_recvmmsg(a0, (struct mmsghdr __user *)a1, a[2], a[3], (struct __kernel_timespec __user *)a[4],
The CONFIG_64BIT_TIME option is defined on all architectures, and can be removed for simplicity now. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- arch/Kconfig | 8 -------- fs/aio.c | 2 +- ipc/syscall.c | 2 +- kernel/time/hrtimer.c | 2 +- kernel/time/time.c | 4 ++-- net/socket.c | 2 +- 6 files changed, 6 insertions(+), 14 deletions(-) -- 2.20.0