From: Thomas Gleixner <tglx@linutronix.de>
To: Sean Christopherson <sean.j.christopherson@intel.com>
Cc: LKML <linux-kernel@vger.kernel.org>,
x86@kernel.org, Andy Lutomirski <luto@kernel.org>,
Vincenzo Frascino <vincenzo.frascino@arm.com>,
Kees Cook <keescook@chromium.org>,
Paul Bolle <pebolle@tiscali.nl>, Will Deacon <will@kernel.org>
Subject: [patch V2 3/5] lib/vdso/32: Provide legacy syscall fallbacks
Date: Tue, 30 Jul 2019 11:38:50 +0200 (CEST) [thread overview]
Message-ID: <alpine.DEB.2.21.1907301134470.1738@nanos.tec.linutronix.de> (raw)
In-Reply-To: <20190729144831.GA21120@linux.intel.com>
To address the regression which causes seccomp to deny applications the
access to clock_gettime64() and clock_getres64() syscalls because they
are not enabled in the existing filters.
That trips over the fact that 32bit VDSOs use the new clock_gettime64() and
clock_getres64() syscalls in the fallback path.
Add a conditional to invoke the 32bit legacy fallback syscalls instead of
the new 64bit variants. The conditional can go away once all architectures
are converted.
Fixes: 00b26474c2f1 ("lib/vdso: Provide generic VDSO implementation")
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
V2: Move the #ifdef into the fallback function
---
lib/vdso/gettimeofday.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
--- a/lib/vdso/gettimeofday.c
+++ b/lib/vdso/gettimeofday.c
@@ -125,14 +125,18 @@ static __maybe_unused int
ret = __cvdso_clock_gettime_common(clock, &ts);
+#ifdef VDSO_HAS_32BIT_FALLBACK
+ if (unlikely(ret))
+ return clock_gettime32_fallback(clock, res);
+#else
if (unlikely(ret))
ret = clock_gettime_fallback(clock, &ts);
+#endif
if (likely(!ret)) {
res->tv_sec = ts.tv_sec;
res->tv_nsec = ts.tv_nsec;
}
-
return ret;
}
@@ -232,8 +236,14 @@ static __maybe_unused int
int ret;
ret = __cvdso_clock_getres_common(clock, &ts);
+
+#ifdef VDSO_HAS_32BIT_FALLBACK
+ if (unlikely(ret))
+ return clock_getres32_fallback(clock, res);
+#else
if (unlikely(ret))
ret = clock_getres_fallback(clock, &ts);
+#endif
if (likely(!ret)) {
res->tv_sec = ts.tv_sec;
next prev parent reply other threads:[~2019-07-30 9:38 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-28 13:12 [patch 0/5] lib/vdso, x86/vdso: Fix fallout from generic VDSO conversion Thomas Gleixner
2019-07-28 13:12 ` [patch 1/5] lib/vdso/32: Remove inconsistent NULL pointer checks Thomas Gleixner
2019-07-28 14:33 ` Andy Lutomirski
2019-07-28 14:42 ` Thomas Gleixner
2019-07-28 15:30 ` Vincenzo Frascino
2019-07-29 14:52 ` Sean Christopherson
2019-07-30 22:19 ` [tip:timers/urgent] " tip-bot for Thomas Gleixner
2019-07-28 13:12 ` [patch 2/5] lib/vdso: Move fallback invocation to the callers Thomas Gleixner
2019-07-28 14:37 ` Andy Lutomirski
2019-07-28 15:31 ` Vincenzo Frascino
2019-07-30 22:19 ` [tip:timers/urgent] " tip-bot for Thomas Gleixner
2019-07-28 13:12 ` [patch 3/5] lib/vdso/32: Provide legacy syscall fallbacks Thomas Gleixner
2019-07-28 14:39 ` Andy Lutomirski
2019-07-28 15:33 ` Vincenzo Frascino
2019-07-29 14:48 ` Sean Christopherson
2019-07-30 9:38 ` Thomas Gleixner [this message]
2019-07-30 14:28 ` [patch V2 " Sean Christopherson
2019-07-30 20:09 ` Andy Lutomirski
2019-07-30 20:14 ` Thomas Gleixner
2019-07-30 22:20 ` [tip:timers/urgent] " tip-bot for Thomas Gleixner
2019-07-28 13:12 ` [patch 4/5] x86/vdso/32: Use 32bit syscall fallback Thomas Gleixner
2019-07-28 14:50 ` Andy Lutomirski
2019-07-29 11:23 ` Vincenzo Frascino
2019-07-29 14:51 ` Sean Christopherson
2019-07-30 22:21 ` [tip:timers/urgent] " tip-bot for Thomas Gleixner
2019-07-28 13:12 ` [patch 5/5] arm64: compat: vdso: Use legacy syscalls as fallback Thomas Gleixner
2019-07-28 15:35 ` Vincenzo Frascino
2019-07-30 22:22 ` [tip:timers/urgent] " tip-bot for Thomas Gleixner
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=alpine.DEB.2.21.1907301134470.1738@nanos.tec.linutronix.de \
--to=tglx@linutronix.de \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=pebolle@tiscali.nl \
--cc=sean.j.christopherson@intel.com \
--cc=vincenzo.frascino@arm.com \
--cc=will@kernel.org \
--cc=x86@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).