From: Dan Williams <dan.j.williams@intel.com>
To: linux-kernel@vger.kernel.org
Cc: linux-arch@vger.kernel.org, Andi Kleen <ak@linux.intel.com>,
Arnd Bergmann <arnd@arndb.de>,
gregkh@linuxfoundation.org, peterz@infradead.org,
netdev@vger.kernel.org, x86@kernel.org,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
tglx@linutronix.de, torvalds@linux-foundation.org,
alan@linux.intel.com
Subject: [PATCH 06/18] x86, barrier: stop speculation for failed access_ok
Date: Fri, 05 Jan 2018 17:10:26 -0800 [thread overview]
Message-ID: <151520102670.32271.8447983009852138826.stgit@dwillia2-desk3.amr.corp.intel.com> (raw)
In-Reply-To: <151520099201.32271.4677179499894422956.stgit@dwillia2-desk3.amr.corp.intel.com>
From: Andi Kleen <ak@linux.intel.com>
When access_ok fails we should always stop speculating.
Add the required barriers to the x86 access_ok macro.
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: x86@kernel.org
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---
arch/x86/include/asm/uaccess.h | 17 +++++++++++++----
include/asm-generic/barrier.h | 6 +++---
2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
index 574dff4d2913..9b6f20cfaeb9 100644
--- a/arch/x86/include/asm/uaccess.h
+++ b/arch/x86/include/asm/uaccess.h
@@ -43,6 +43,8 @@ static inline void set_fs(mm_segment_t fs)
/*
* Test whether a block of memory is a valid user space address.
* Returns 0 if the range is valid, nonzero otherwise.
+ *
+ * We also disable speculation when a check fails.
*/
static inline bool __chk_range_not_ok(unsigned long addr, unsigned long size, unsigned long limit)
{
@@ -53,14 +55,19 @@ static inline bool __chk_range_not_ok(unsigned long addr, unsigned long size, un
* important to subtract the size from the
* limit, not add it to the address).
*/
- if (__builtin_constant_p(size))
- return unlikely(addr > limit - size);
+ if (__builtin_constant_p(size)) {
+ if (unlikely(addr > limit - size))
+ return true;
+ nospec_barrier();
+ return false;
+ }
/* Arbitrary sizes? Be careful about overflow */
addr += size;
- if (unlikely(addr < size))
+ if (unlikely(addr < size || addr > limit))
return true;
- return unlikely(addr > limit);
+ nospec_barrier();
+ return false;
}
#define __range_not_ok(addr, size, limit) \
@@ -94,6 +101,8 @@ static inline bool __chk_range_not_ok(unsigned long addr, unsigned long size, un
* Note that, depending on architecture, this function probably just
* checks that the pointer is in the user space range - after calling
* this function, memory access functions may still return -EFAULT.
+ *
+ * Stops speculation automatically
*/
#define access_ok(type, addr, size) \
({ \
diff --git a/include/asm-generic/barrier.h b/include/asm-generic/barrier.h
index 91c3071f49e5..a11765eba860 100644
--- a/include/asm-generic/barrier.h
+++ b/include/asm-generic/barrier.h
@@ -59,7 +59,9 @@
*
* Architectures with a suitable memory barrier should provide an
* implementation. This is non-portable, and generic code should use
- * nospec_ptr().
+ * nospec_{array_ptr,ptr}. Arch-specific code should define and use
+ * nospec_barrier() for usages where nospec_{array_ptr,ptr} is
+ * unsuitable.
*/
#ifndef __nospec_barrier
#define __nospec_barrier() do { } while (0)
@@ -120,8 +122,6 @@
nospec_ptr(__arr + __idx, __arr, __arr + __sz); \
})
-#undef __nospec_barrier
-
#ifndef __smp_mb
#define __smp_mb() mb()
#endif
next prev parent reply other threads:[~2018-01-06 1:18 UTC|newest]
Thread overview: 162+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-06 1:09 [PATCH 00/18] prevent bounds-check bypass via speculative execution Dan Williams
2018-01-06 1:09 ` [PATCH 01/18] asm-generic/barrier: add generic nospec helpers Dan Williams
2018-01-06 2:55 ` Linus Torvalds
2018-01-06 5:23 ` Dan Williams
2018-01-06 17:08 ` Mark Rutland
2018-01-06 1:10 ` [PATCH 02/18] Documentation: document " Dan Williams
2018-01-08 16:29 ` Jonathan Corbet
2018-01-08 17:09 ` Mark Rutland
2018-01-08 21:19 ` Jonathan Corbet
2018-01-06 1:10 ` [PATCH 03/18] arm64: implement nospec_ptr() Dan Williams
2018-01-06 1:10 ` [PATCH 04/18] arm: " Dan Williams
2018-01-10 2:04 ` Laura Abbott
2018-01-10 7:40 ` Hanjun Guo
2018-01-10 17:24 ` Laura Abbott
2018-01-06 1:10 ` [PATCH 05/18] x86: implement nospec_barrier() Dan Williams
2018-01-06 1:10 ` Dan Williams [this message]
2018-01-06 2:52 ` [PATCH 06/18] x86, barrier: stop speculation for failed access_ok Linus Torvalds
2018-01-06 3:09 ` Linus Torvalds
2018-01-06 23:31 ` Dan Williams
2018-01-07 1:20 ` Linus Torvalds
2018-01-08 21:09 ` Dan Williams
2018-01-08 23:44 ` Linus Torvalds
2018-01-08 23:53 ` Dan Williams
2018-01-06 5:47 ` Dan Williams
2018-01-06 12:32 ` Alan Cox
2018-01-06 17:56 ` Linus Torvalds
2018-01-06 18:13 ` Alexei Starovoitov
2018-01-06 18:29 ` Dan Williams
2018-01-06 18:39 ` Alexei Starovoitov
2018-01-06 18:54 ` Dan Williams
2018-01-06 19:25 ` Alexei Starovoitov
2018-01-06 19:36 ` Dan Williams
2018-01-06 19:41 ` Thomas Gleixner
2018-01-08 10:02 ` Andrea Arcangeli
2018-01-06 18:38 ` Alan Cox
2018-01-06 18:51 ` Alexei Starovoitov
2018-01-06 19:55 ` Alan Cox
2018-01-06 20:09 ` Alexei Starovoitov
2018-01-06 20:22 ` Alan Cox
2018-01-06 21:17 ` Alexei Starovoitov
2018-01-06 21:21 ` Thomas Gleixner
2018-01-06 23:05 ` Alan Cox
2018-01-07 3:38 ` Alexei Starovoitov
2018-01-07 6:33 ` Willy Tarreau
2018-01-07 19:47 ` Linus Torvalds
2018-01-07 20:12 ` Willy Tarreau
2018-01-07 20:17 ` Linus Torvalds
2018-01-07 20:56 ` Thomas Gleixner
2018-01-08 2:23 ` David Miller
2018-01-08 7:38 ` Greg KH
2018-01-07 22:15 ` Willy Tarreau
2018-01-07 20:15 ` Dan Williams
2018-01-08 2:24 ` Alexei Starovoitov
2018-01-08 9:51 ` Peter Zijlstra
2018-01-08 18:21 ` Ingo Molnar
2018-01-08 12:00 ` David Laight
2018-01-08 12:12 ` Alan Cox
2018-01-08 12:33 ` David Laight
2018-01-07 10:08 ` Thomas Gleixner
2018-01-08 2:09 ` Alexei Starovoitov
2018-01-07 13:59 ` Alan Cox
2018-01-08 2:57 ` Alexei Starovoitov
2018-01-08 9:57 ` Peter Zijlstra
2018-01-06 20:42 ` Willy Tarreau
2018-01-07 1:36 ` David Miller
2018-01-07 17:19 ` James Bottomley
2018-01-07 18:31 ` Thomas Gleixner
2018-01-08 2:04 ` David Miller
2018-01-07 19:24 ` Alan Cox
2018-01-09 21:41 ` Josh Poimboeuf
2018-01-09 21:47 ` Dan Williams
2018-01-09 21:49 ` Josh Poimboeuf
2018-01-09 21:59 ` Dan Williams
2018-01-09 22:23 ` Josh Poimboeuf
2018-01-09 22:35 ` Dan Williams
2018-01-06 1:10 ` [PATCH 07/18] [media] uvcvideo: prevent bounds-check bypass via speculative execution Dan Williams
2018-01-06 9:09 ` Greg KH
2018-01-06 9:40 ` Greg KH
2018-01-06 17:41 ` Dan Williams
2018-01-07 9:09 ` Greg KH
2018-01-07 19:37 ` Dan Williams
2018-01-09 8:40 ` Laurent Pinchart
2018-01-09 10:04 ` Greg KH
2018-01-09 14:26 ` Laurent Pinchart
2018-01-09 14:47 ` Greg KH
2018-01-08 11:23 ` Laurent Pinchart
2018-01-09 2:11 ` Dan Williams
2018-01-06 1:10 ` [PATCH 08/18] carl9170: " Dan Williams
2018-01-06 10:01 ` Sergei Shtylyov
2018-01-06 14:23 ` Christian Lamparter
2018-01-06 15:06 ` Alan Cox
2018-01-06 16:38 ` Christian Lamparter
2018-01-06 16:34 ` Dan Williams
2018-01-06 1:10 ` [PATCH 09/18] p54: " Dan Williams
2018-01-06 10:01 ` Sergei Shtylyov
2018-01-06 1:10 ` [PATCH 10/18] qla2xxx: " Dan Williams
2018-01-06 9:03 ` Greg KH
2018-01-06 9:42 ` Greg KH
2018-01-11 22:15 ` Dan Williams
2018-01-12 7:27 ` Greg KH
2018-01-12 15:25 ` James Bottomley
2018-01-06 1:10 ` [PATCH 11/18] cw1200: " Dan Williams
2018-01-06 1:10 ` [PATCH 12/18] Thermal/int340x: " Dan Williams
2018-01-06 1:53 ` Srinivas Pandruvada
2018-01-06 1:57 ` Dan Williams
2018-01-06 17:24 ` Srinivas Pandruvada
2018-01-06 10:03 ` Sergei Shtylyov
2018-01-06 1:11 ` [PATCH 13/18] ipv6: " Dan Williams
2018-01-06 10:04 ` Sergei Shtylyov
2018-01-06 14:48 ` Stephen Hemminger
2018-01-06 18:05 ` Dan Williams
2018-01-06 1:11 ` [PATCH 14/18] ipv4: " Dan Williams
2018-01-06 9:00 ` Greg KH
2018-01-06 9:01 ` Greg KH
2018-01-06 12:23 ` Alan Cox
2018-01-06 15:14 ` Greg KH
2018-01-06 16:29 ` Dan Williams
2018-01-06 18:10 ` Dan Williams
2018-01-06 10:04 ` Sergei Shtylyov
2018-01-06 1:11 ` [PATCH 15/18] vfs, fdtable: " Dan Williams
2018-01-06 10:05 ` Sergei Shtylyov
2018-01-06 1:11 ` [PATCH 16/18] net: mpls: " Dan Williams
2018-01-06 10:06 ` Sergei Shtylyov
2018-01-09 3:11 ` Eric W. Biederman
2018-01-09 3:42 ` Dan Williams
2018-01-09 4:13 ` Linus Torvalds
2018-01-09 4:21 ` Linus Torvalds
2018-01-10 0:48 ` Dan Williams
2018-01-10 1:33 ` Dan Williams
2018-01-10 1:57 ` Alexei Starovoitov
2018-01-10 2:22 ` Dan Williams
2018-01-10 3:07 ` Alexei Starovoitov
2018-01-10 3:27 ` Linus Torvalds
2018-01-09 16:17 ` Eric W. Biederman
2018-01-09 18:01 ` Dan Williams
2018-01-10 0:54 ` Eric W. Biederman
2018-01-10 1:31 ` Dan Williams
2018-01-06 1:11 ` [PATCH 17/18] udf: " Dan Williams
2018-01-08 10:20 ` Jan Kara
2018-01-06 1:11 ` [PATCH 18/18] userns: " Dan Williams
2018-01-06 2:22 ` [PATCH 00/18] " Eric W. Biederman
2018-01-06 6:30 ` Dan Williams
2018-01-08 10:08 ` Peter Zijlstra
2018-01-08 11:14 ` Laurent Pinchart
2018-01-08 11:43 ` Alan Cox
2018-01-08 11:55 ` Peter Zijlstra
2018-01-08 18:33 ` Ingo Molnar
2018-01-08 16:20 ` Bart Van Assche
2018-01-06 18:56 ` Florian Fainelli
2018-01-06 18:59 ` Arjan van de Ven
2018-01-06 19:37 ` Dan Williams
2018-01-06 20:07 ` Dan Williams
2018-01-08 4:49 ` Bart Van Assche
2018-01-08 13:33 ` Arjan van de Ven
2018-01-09 19:34 ` Jiri Kosina
2018-01-09 19:44 ` Dan Williams
2018-01-09 20:55 ` Josh Poimboeuf
2018-01-11 9:54 ` Jiri Kosina
2018-01-11 15:58 ` Dan Williams
2018-01-11 16:34 ` Daniel Borkmann
2018-01-13 11:33 ` QingFeng Hao
2018-01-09 0:12 [PATCH 06/18] x86, barrier: stop speculation for failed access_ok Linus Torvalds
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=151520102670.32271.8447983009852138826.stgit@dwillia2-desk3.amr.corp.intel.com \
--to=dan.j.williams@intel.com \
--cc=ak@linux.intel.com \
--cc=alan@linux.intel.com \
--cc=arnd@arndb.de \
--cc=gregkh@linuxfoundation.org \
--cc=hpa@zytor.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.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).