From: Andy Lutomirski <luto@kernel.org>
To: x86@kernel.org, Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>,
Darren Hart <dvhart@infradead.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
Andy Lutomirski <luto@kernel.org>,
linux-s390@vger.kernel.org,
Martin Schwidefsky <schwidefsky@de.ibm.com>,
Heiko Carstens <heiko.carstens@de.ibm.com>,
Finn Thain <fthain@telegraphics.com.au>,
Geert Uytterhoeven <geert@linux-m68k.org>
Subject: [PATCH] futex: Set USER_DS for the futex_detect_cmpxchg() test
Date: Thu, 27 Sep 2018 21:44:13 -0700 [thread overview]
Message-ID: <74fb6ce22f62e0fb48b91ca9918b74cedbcecaf1.1538096323.git.luto@kernel.org> (raw)
futex_detect_cmpxchg() checks whether cmpxchg is available by trying
it on the NULL pointer and seeing what the error code is (EFAULT vs
ENOSYS). This happens with KERNEL_DS set, which is impolite: while
the NULL *user* pointer is definitely invalid when there is no user
program running, the NULL *kernel* pointer seems more like a
programming error than a safe place to do an intentionally-failing
access. An upcoming hardening series I'm working on causes the
existing code to OOPS, because it considers any failed uaccess with
KERNEL_DS to be a sign of a bug.
Explicitly set USER_DS to avoid this problem.
Cc: linux-s390@vger.kernel.org
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Finn Thain <fthain@telegraphics.com.au>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
---
I have a couple questions here:
- Is this actually okay on all architectures? That is, are there
cases where we'll screw up if we fail a USER_DS access this early?
s390 stands out as the obvious special case (where USER_DS is not
than just a subset of KERNEL_DS), but s390 opts out.
- Why doesn't x86 set HAVE_FUTEX_CMPXCHG? Or do we still support
some 32-bit configurations that don't have cmpxchg and don't know
about it at compile time?
kernel/futex.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/kernel/futex.c b/kernel/futex.c
index 11fc3bb456d6..16bd3e72602a 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -3593,6 +3593,7 @@ static void __init futex_detect_cmpxchg(void)
{
#ifndef CONFIG_HAVE_FUTEX_CMPXCHG
u32 curval;
+ mm_segment_t old_seg;
/*
* This will fail and we want it. Some arch implementations do
@@ -3604,8 +3605,11 @@ static void __init futex_detect_cmpxchg(void)
* implementation, the non-functional ones will return
* -ENOSYS.
*/
+ old_seg = get_fs();
+ set_fs(USER_DS);
if (cmpxchg_futex_value_locked(&curval, NULL, 0, 0) == -EFAULT)
futex_cmpxchg_enabled = 1;
+ set_fs(old_seg);
#endif
}
--
2.17.1
next reply other threads:[~2018-09-28 4:44 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-28 4:44 Andy Lutomirski [this message]
2018-09-28 6:20 ` [PATCH] futex: Set USER_DS for the futex_detect_cmpxchg() test Thomas Gleixner
2018-09-28 6:24 ` Thomas Gleixner
2018-09-28 7:12 ` Geert Uytterhoeven
2018-09-28 8:31 ` Thomas Gleixner
2018-09-28 8:37 ` Martin Schwidefsky
2018-09-28 8:42 ` Thomas Gleixner
2018-09-28 14:11 ` Andy Lutomirski
2018-09-28 14:40 ` Thomas Gleixner
2018-09-28 14:53 ` Martin Schwidefsky
2018-09-28 18:02 ` Andy Lutomirski
2018-09-28 19:38 ` Thomas Gleixner
2018-09-28 20:19 ` Max Filippov
2018-09-28 20:26 ` Thomas Gleixner
2018-09-28 21:08 ` Andy Lutomirski
2018-09-28 21:36 ` Max Filippov
2018-09-29 6:32 ` 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=74fb6ce22f62e0fb48b91ca9918b74cedbcecaf1.1538096323.git.luto@kernel.org \
--to=luto@kernel.org \
--cc=dvhart@infradead.org \
--cc=fthain@telegraphics.com.au \
--cc=geert@linux-m68k.org \
--cc=heiko.carstens@de.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=schwidefsky@de.ibm.com \
--cc=tglx@linutronix.de \
--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).