From: "Jason A. Donenfeld" <Jason@zx2c4.com>
To: linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org
Cc: "Jason A. Donenfeld" <Jason@zx2c4.com>,
Paul Burton <paulburton@kernel.org>,
Arnd Bergmann <arnd@arndb.de>,
Vincenzo Frascino <vincenzo.frascino@arm.com>,
Christian Brauner <christian.brauner@canonical.com>
Subject: [PATCH] mips: vdso: conditionalize 32-bit time functions on COMPAT_32BIT_TIME
Date: Tue, 24 Dec 2019 14:54:04 +0100 [thread overview]
Message-ID: <20191224135404.389039-1-Jason@zx2c4.com> (raw)
In-Reply-To: <20191223130834.GA102399@zx2c4.com>
When the VDSO falls back to 32-bit time functions on kernels with
COMPAT_32BIT_TIME=n, userspace becomes corrupted and appears to crash
shortly after, with something like:
[ 0.359617] do_page_fault(): sending SIGSEGV to init for invalid read access from 000000007ff790d0
[ 0.359843] epc = 0000000077e45df4 in libc.so[77da6000+de000]
[ 0.360319] ra = 0000000010000c50 in init[10000000+2000]
[ 0.364456] Kernel panic - not syncing: Attempted to kill init! exitcode=0x0000000b
This can be reproduced with simply calling `clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &ts)`,
since `CLOCK_PROCESS_CPUTIME_ID` is not exported to the VDSO, invoking
the syscall callback branch. This crash was observed with musl 1.20's
clock_gettime implementation:
int __clock_gettime(clockid_t clk, struct timespec *ts)
{
int r;
int (*f)(clockid_t, struct timespec *) =
(int (*)(clockid_t, struct timespec *))vdso_func;
if (f) {
r = f(clk, ts);
if (!r) {
return r;
}
if (r == -EINVAL)
return __syscall_ret(r);
}
r = __syscall(SYS_clock_gettime, clk, ts); // <-- CRASH
if (r == -ENOSYS) {
if (clk == CLOCK_REALTIME) {
__syscall(SYS_gettimeofday, ts, 0);
ts->tv_nsec = (int)ts->tv_nsec * 1000;
return 0;
}
r = -EINVAL;
}
return __syscall_ret(r);
}
The particular kernel and libc are built as part of the MIPS64 CI on
build.wireguard.com which generally uses as minimal configurations as
possible.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Cc: Paul Burton <paulburton@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>
Cc: Christian Brauner <christian.brauner@canonical.com>
Fixes: 942437c97fd9 ("y2038: allow disabling time32 system calls")
---
arch/mips/include/asm/vdso/gettimeofday.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/mips/include/asm/vdso/gettimeofday.h b/arch/mips/include/asm/vdso/gettimeofday.h
index b08825531e9f..7f1aa610e68e 100644
--- a/arch/mips/include/asm/vdso/gettimeofday.h
+++ b/arch/mips/include/asm/vdso/gettimeofday.h
@@ -107,7 +107,7 @@ static __always_inline int clock_getres_fallback(
return error ? -ret : ret;
}
-#if _MIPS_SIM != _MIPS_SIM_ABI64
+#if _MIPS_SIM != _MIPS_SIM_ABI64 && defined(CONFIG_COMPAT_32BIT_TIME)
#define VDSO_HAS_32BIT_FALLBACK 1
--
2.24.1
next prev parent reply other threads:[~2019-12-24 13:54 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-23 13:08 vdso-related userspace crashes on 5.5 mips64 Jason A. Donenfeld
2019-12-23 21:44 ` Jason A. Donenfeld
2019-12-23 23:29 ` Paul Burton
2019-12-24 13:37 ` Jason A. Donenfeld
2019-12-30 15:58 ` Arnd Bergmann
2019-12-24 14:19 ` Jason A. Donenfeld
2019-12-24 13:54 ` Jason A. Donenfeld [this message]
2019-12-30 11:57 ` [PATCH] mips: vdso: conditionalize 32-bit time functions on COMPAT_32BIT_TIME Arnd Bergmann
2019-12-30 12:26 ` Jason A. Donenfeld
2019-12-30 12:34 ` Arnd Bergmann
2019-12-30 14:37 ` Jason A. Donenfeld
2019-12-30 15:10 ` Jason A. Donenfeld
2019-12-30 15:37 ` Arnd Bergmann
2019-12-30 15:39 ` Jason A. Donenfeld
2019-12-30 15:47 ` Arnd Bergmann
2019-12-30 15:58 ` Jason A. Donenfeld
2019-12-30 17:33 ` Arnd Bergmann
2019-12-30 21:09 ` Jason A. Donenfeld
2019-12-30 21:42 ` Jason A. Donenfeld
2019-12-31 16:14 ` Jason A. Donenfeld
2020-01-01 4:10 ` Paul Burton
2020-01-01 4:25 ` Paul Burton
2020-01-01 9:47 ` Jason A. Donenfeld
2020-01-01 9:47 ` Jason A. Donenfeld
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191224135404.389039-1-Jason@zx2c4.com \
--to=jason@zx2c4.com \
--cc=arnd@arndb.de \
--cc=christian.brauner@canonical.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=paulburton@kernel.org \
--cc=vincenzo.frascino@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox