linux-kernel - [tip:timers/urgent] posix-timers: Fix nanosleep_copyout() for CONFIG_COMPAT_32BIT

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <tip-0fe2795516b9e1c59b58b02bdf8658698117ec4e@git.kernel.org>
Date:   Tue, 19 Jun 2018 00:27:47 -0700
From:   tip-bot for Arnd Bergmann <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     mingo@...nel.org, rafael.j.wysocki@...el.com, arnd@...db.de,
        deepa.kernel@...il.com, hpa@...or.com, anna-maria@...utronix.de,
        linux-kernel@...r.kernel.org, tglx@...utronix.de
Subject: [tip:timers/urgent] posix-timers: Fix nanosleep_copyout() for
 CONFIG_COMPAT_32BIT_TIME

Commit-ID:  0fe2795516b9e1c59b58b02bdf8658698117ec4e
Gitweb:     https://git.kernel.org/tip/0fe2795516b9e1c59b58b02bdf8658698117ec4e
Author:     Arnd Bergmann <arnd@...db.de>
AuthorDate: Mon, 18 Jun 2018 16:07:59 +0200
Committer:  Thomas Gleixner <tglx@...utronix.de>
CommitDate: Tue, 19 Jun 2018 09:23:19 +0200

posix-timers: Fix nanosleep_copyout() for CONFIG_COMPAT_32BIT_TIME

Commit b5793b0d92c9 added support for building the nanosleep compat system
call on 32-bit architectures, but missed one change in nanosleep_copyout(),
which would trigger a BUG() as soon as any architecture is switched over to
use it.

Use the proper config symbol to enable the code path.

Fixes: Commit b5793b0d92c9 ("posix-timers: Make compat syscalls depend on CONFIG_COMPAT_32BIT_TIME")
Signed-off-by: Arnd Bergmann <arnd@...db.de>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Cc: y2038@...ts.linaro.org
Cc: Anna-Maria Gleixner <anna-maria@...utronix.de>
Cc: Deepa Dinamani <deepa.kernel@...il.com>
Cc: "Rafael J. Wysocki" <rafael.j.wysocki@...el.com>
Link: https://lkml.kernel.org/r/20180618140811.2998503-1-arnd@arndb.de

---
 kernel/time/hrtimer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
index 055a4a728c00..3e93c54bd3a1 100644
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -1659,7 +1659,7 @@ EXPORT_SYMBOL_GPL(hrtimer_init_sleeper);
 int nanosleep_copyout(struct restart_block *restart, struct timespec64 *ts)
 {
 	switch(restart->nanosleep.type) {
-#ifdef CONFIG_COMPAT
+#ifdef CONFIG_COMPAT_32BIT_TIME
 	case TT_COMPAT:
 		if (compat_put_timespec64(ts, restart->nanosleep.compat_rmtp))
 			return -EFAULT;