Linux 3.2.101
I'm announcing the release of the 3.2.101 kernel.
All users of the 3.2 kernel series should upgrade.
The updated 3.2.y git tree can be found at:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.2.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git
The diff from 3.2.100 is attached to this message.
Ben.
------------
Documentation/ABI/testing/sysfs-devices-system-cpu | 16 + Documentation/gcov.txt | 4 + Documentation/kernel-parameters.txt | 51 +- Documentation/speculation.txt | 90 ++++ Documentation/x86/pti.txt | 186 +++++++ Makefile | 4 +- arch/cris/arch-v10/lib/Makefile | 3 - arch/x86/Kconfig | 14 + arch/x86/Makefile | 8 + arch/x86/ia32/ia32entry.S | 54 +- arch/x86/include/asm/alternative-asm.h | 19 +- arch/x86/include/asm/alternative.h | 24 +- arch/x86/include/asm/asm.h | 17 +- arch/x86/include/asm/bitops.h | 2 + arch/x86/include/asm/cpufeature.h | 22 + arch/x86/include/asm/intel-family.h | 68 +++ arch/x86/include/asm/msr-index.h | 3 + arch/x86/include/asm/msr.h | 2 + arch/x86/include/asm/nospec-branch.h | 199 ++++++++ arch/x86/include/asm/processor.h | 6 +- arch/x86/include/asm/system.h | 68 ++- arch/x86/include/asm/thread_info.h | 3 - arch/x86/include/asm/uaccess.h | 8 +- arch/x86/include/asm/uaccess_32.h | 12 + arch/x86/include/asm/uaccess_64.h | 22 +- arch/x86/include/asm/xen/hypercall.h | 5 +- arch/x86/kernel/alternative.c | 31 +- arch/x86/kernel/cpu/Makefile | 4 +- arch/x86/kernel/cpu/amd.c | 28 +- arch/x86/kernel/cpu/bugs.c | 299 ++++++++++- arch/x86/kernel/cpu/bugs_64.c | 33 -- arch/x86/kernel/cpu/common.c | 34 +- arch/x86/kernel/entry_32.S | 24 +- arch/x86/kernel/entry_64.S | 31 +- arch/x86/kernel/irq_32.c | 9 +- arch/x86/kernel/kprobes.c | 23 +- arch/x86/kernel/vmlinux.lds.S | 7 + arch/x86/kvm/svm.c | 69 ++- arch/x86/kvm/vmx.c | 110 ++-- arch/x86/lib/Makefile | 2 + arch/x86/lib/checksum_32.S | 7 +- arch/x86/lib/getuser.S | 8 + arch/x86/lib/msr.c | 89 +++- arch/x86/lib/retpoline-export.c | 25 + arch/x86/lib/retpoline.S | 45 ++ arch/x86/lib/usercopy_32.c | 5 + drivers/base/Kconfig | 3 + drivers/base/cpu.c | 49 ++ drivers/edac/mce_amd.h | 2 - drivers/hv/hv.c | 25 +- drivers/media/common/tuners/max2165.c | 9 +- drivers/media/dvb/frontends/tda8261_cfg.h | 2 +- drivers/net/ethernet/realtek/atp.c | 58 +-- drivers/net/ethernet/realtek/atp.h | 2 - drivers/net/wireless/ath/ath6kl/hif.h | 2 +- drivers/net/wireless/ath/ath6kl/sdio.c | 4 +- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 2 +- drivers/net/wireless/brcm80211/brcmsmac/aiutils.c | 3 - drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | 5 +- drivers/net/wireless/rtlwifi/rtl8192de/dm.c | 6 +- drivers/net/wireless/rtlwifi/rtl8192se/phy.c | 3 + drivers/staging/wlan-ng/p80211netdev.c | 2 + drivers/usb/renesas_usbhs/mod_gadget.c | 6 +- drivers/usb/renesas_usbhs/mod_host.c | 6 +- drivers/usb/renesas_usbhs/pipe.h | 6 +- fs/compat.c | 10 +- fs/compat_ioctl.c | 1 - fs/internal.h | 2 +- fs/namespace.c | 26 +- include/linux/bitops.h | 3 + include/linux/cpu.h | 7 + include/linux/fdtable.h | 5 +- include/linux/init.h | 9 +- include/linux/kaiser.h | 2 +- include/linux/kconfig.h | 23 +- include/linux/module.h | 9 + include/linux/nospec.h | 59 +++ include/net/bluetooth/hci_core.h | 1 - kernel/gcov/Kconfig | 30 ++ kernel/gcov/Makefile | 32 +- kernel/gcov/base.c | 38 +- kernel/gcov/fs.c | 27 +- kernel/gcov/gcc_3_4.c | 115 +++++ kernel/gcov/gcc_4_7.c | 565 +++++++++++++++++++++ kernel/gcov/gcov.h | 65 +-- kernel/kprobes.c | 10 +- kernel/module.c | 11 + net/bluetooth/hci_conn.c | 16 - scripts/mod/modpost.c | 58 ++- security/selinux/ss/services.c | 54 +- 90 files changed, 2688 insertions(+), 478 deletions(-)
Alexandre Oliva (1):
brcmfmac: work-around gcc 4.7 build issue
Andi Kleen (5):
brcm80211: Remove bogus memcpy in ai_detach
ath6kl: fix uninitialized variable in ath6kl_sdio_enable_scatter() x86/retpoline/irq32: Convert assembler indirect jumps x86/retpoline: Optimize inline assembler for vmexit_fill_RSB module/retpoline: Warn about missing retpoline in module
Andrey Ryabinin (1):
x86/asm: Use register variable to get stack pointer value
Andy Lutomirski (2):
x86/cpu: Factor out application of forced CPU caps x86/asm: Make asm/alternative.h safe from assembly
Arnd Bergmann (2):
Turn off -Wmaybe-uninitialized when building with -Os
x86: fix build warnign with 32-bit PAE
Avi Kivity (2):
KVM: VMX: Make use of asm.h
KVM: SVM: Make use of asm.h
Ben Hutchings (2):
x86/syscall: Sanitize syscall table de-references under speculation Linux 3.2.101
Borislav Petkov (9):
x86/bitops: Move BIT_64() for a wider use
x86, cpu: Expand cpufeature facility to include cpu bugs
x86: Add another set of MSR accessor functions x86/cpu: Merge bugs.c and bugs_64.c x86/alternatives: Guard NOPs optimization x86/alternatives: Fix ALTERNATIVE_2 padding generation properly x86/alternatives: Fix optimize_nops() checking x86/nospec: Fix header guards names
x86/bugs: Drop one "mitigation" from dmesg
Colin Ian King (1):
x86/spectre: Fix spelling mistake: "vunerable"-> "vulnerable"
Dan Carpenter (1):
x86/spectre: Fix an error message
Dan Williams (11):
array_index_nospec: Sanitize speculative array de-references
x86: Implement array_index_mask_nospec
x86: Introduce barrier_nospec
x86/get_user: Use pointer masking to limit speculation vfs, fdtable: Prevent bounds-check bypass via speculative execution x86/spectre: Report get_user mitigation for spectre_v1 x86/kvm: Update spectre-v1 mitigation
nospec: Kill array_index_nospec_mask_check()
nospec: Include <asm/barrier.h> dependency
x86: Introduce __uaccess_begin_nospec() and uaccess_try_nospec x86/uaccess: Use __uaccess_begin_nospec() and uaccess_try_nospec
Danny Kukawka (1):
max2165: trival fix for some -Wuninitialized warning
Darren Kenny (1):
x86/speculation: Fix typo IBRS_ATT, which should be IBRS_ALL
Dave Hansen (2):
x86/Documentation: Add PTI description x86/cpu/intel: Introduce macros for Intel family numbers
David Woodhouse (14):
x86/alternatives: Add missing ' ' at end of ALTERNATIVE inline asm x86/cpufeatures: Add X86_BUG_SPECTRE_V[12]
sysfs/cpu: Fix typos in vulnerability documentation x86/retpoline: Add initial retpoline support x86/spectre: Add boot time option to select Spectre v2 mitigation x86/retpoline/entry: Convert entry assembler indirect jumps x86/retpoline/ftrace: Convert ftrace assembler indirect jumps x86/retpoline/hyperv: Convert assembler indirect jumps x86/retpoline/xen: Convert Xen hypercall indirect jumps x86/retpoline/checksum32: Convert assembler indirect jumps x86/retpoline: Fill return stack buffer on vmexit x86/retpoline: Fill RSB on context switch for affected CPUs x86/retpoline: Avoid retpolines for built-in __init functions x86/cpufeatures: Clean up Spectre v2 related CPUID flags
Dou Liyang (1):
x86/spectre: Check CONFIG_RETPOLINE in command line parser
Frantisek Hrbata (3):
gcov: move gcov structs definitions to a gcc version specific file
gcov: add support for gcc 4.7 gcov format
gcov: compile specific gcov implementation based on gcc version
H. Peter Anvin (1):
x86, alternative: Add header guards to <asm/alternative-asm.h>
Han Shen (2):
rtl8192c:dm: Properly initialize local array and set value. Removed unused typedef to avoid "unused local typedef" warnings.
Jan-Simon Möller (1):
x86, asm: Extend definitions of _ASM_* with a raw format
Jim Mattson (1):
kvm: vmx: Scrub hardware GPRs at VM-exit
Josh Poimboeuf (1):
x86/paravirt: Remove 'noreplace-paravirt' cmdline option
Kalle Valo (1):
ath6kl: fix struct hif_scatter_req list handling
KarimAllah Ahmed (1):
x86/spectre: Simplify spectre_v2 command line parsing
Kuninori Morimoto (2):
usb: renesas_usbhs: fixup __usbhs_for_each_pipe 1st pos
usb: renesas_usbhs: tidyup original usbhsx_for_each_xxx macro
Larry Finger (3):
rtlwifi: rtl8192se: Fix gcc 4.7.x warning
rtlwifi: rtl8192c: Fix W=1 warning
rtlwifi: rtl8192de: Fix W=1 build warnings
Mark Rutland (1):
Documentation: Document array_index_nospec
Masahiro Yamada (1):
kconfig.h: use __is_defined() to check if MODULE is defined
Masami Hiramatsu (3):
retpoline: Introduce start/end markers of indirect thunk kprobes/x86: Blacklist indirect thunk functions for kprobes kprobes/x86: Disable optimizing on the function jumps to indirect thunk
Mathias Krause (1):
modpost: reduce visibility of symbols and constify r/o arrays
Paul Bolle (2):
budget-av: only use t_state if initialized
atp: remove set_rx_mode_8012()
Paul Gortmaker (3):
modpost: don't emit section mismatch warnings for compiler optimizations
kconfig: fix IS_ENABLED to not require all options to be defined
cris: Remove old legacy "-traditional" flag from arch-v10/lib/Makefile
Peter Huewe (1):
staging/wlan-ng: Fix 'Branch condition evaluates to a garbage value' in p80211netdev.c
Srinivas Pandruvada (1):
bitops: Introduce BIT_ULL
Syam Sidhardhan (1):
Bluetooth: Remove unused hci_le_ltk_reply()
Thomas Gleixner (8):
x86/cpufeatures: Make CPU bugs sticky x86/cpufeatures: Add X86_BUG_CPU_INSECURE
x86/pti: Rename BUG_CPU_INSECURE to BUG_CPU_MELTDOWN sysfs/cpu: Add vulnerability folder
x86/cpu: Implement CPU vulnerabilites sysfs functions x86/alternatives: Make optimize_nops() interrupt safe and synced x86/retpoline: Remove compile time warning x86/cpu/bugs: Make retpoline module warning conditional
Tim Gardner (2):
SELinux: security_load_policy: Silence frame-larger-than warning
fs: namespace: suppress 'may be used uninitialized' warnings
Tom Lendacky (4):
x86/cpu, x86/pti: Do not enable PTI on AMD processors x86/cpu/AMD: Make LFENCE a serializing instruction x86/cpu/AMD: Use LFENCE_RDTSC in preference to MFENCE_RDTSC x86/retpoline: Add LFENCE to the retpoline/RSB filling RSB macros
Waiman Long (1):
x86/retpoline: Remove the esp/rsp thunk
Will Deacon (1):
nospec: Move array_index_nospec() parameter checking into separate macro
Yuan Pengfei (1):
gcov: add support for GCC 4.9
Yunlian Jiang (1):
rtlwifi: initialize local array and set value.
zhenwei.pi (1):
x86/pti: Document fix wrong index
Documentation/ABI/testing/sysfs-devices-system-cpu +16 -0
@@ -201,3 +201,19 @@ Description: Disable L3 cache indices All AMD processors with L3 caches provide this functionality. For details, see BKDGs at http://developer.amd.com/documentation/guides/Pages/default.aspx + +What: /sys/devices/system/cpu/vulnerabilities + /sys/devices/system/cpu/vulnerabilities/meltdown + /sys/devices/system/cpu/vulnerabilities/spectre_v1 + /sys/devices/system/cpu/vulnerabilities/spectre_v2 +Date: January 2018 +Contact: Linux kernel mailing list <[email protected]> +Description: Information about CPU vulnerabilities + + The files are named after the code names of CPU + vulnerabilities. The output of those files reflects the + state of the CPUs in the system. Possible output values: + + "Not affected" CPU is not affected by the vulnerability + "Vulnerable" CPU is affected and no mitigation in effect + "Mitigation: $M" CPU is affected and mitigation $M is in effect
Documentation/gcov.txt +4 -0
@@ -50,6 +50,10 @@ for the entire kernel and provide coverage overviews in HTML format. CONFIG_DEBUG_FS=y CONFIG_GCOV_KERNEL=y +select the gcc's gcov format, default is autodetect based on gcc version: + + CONFIG_GCOV_FORMAT_AUTODETECT=y + and to get coverage data for the entire kernel: CONFIG_GCOV_PROFILE_ALL=y
Documentation/kernel-parameters.txt +42 -9
81 lines not on this page · raw message
Documentation/speculation.txt new file +90 -0
90 lines not on this page · raw message
Documentation/x86/pti.txt new file +186 -0
186 lines not on this page · raw message
Makefile +2 -2
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 2 -SUBLEVEL = 100 +SUBLEVEL = 101 EXTRAVERSION = NAME = Sleepy Otter
@@ -559,7 +559,7 @@ endif # $(dot-config) all: vmlinux ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE -KBUILD_CFLAGS += -Os +KBUILD_CFLAGS += -Os $(call cc-disable-warning,maybe-uninitialized,) else KBUILD_CFLAGS += -O2 endif
arch/cris/arch-v10/lib/Makefile +0 -3
@@ -2,8 +2,5 @@ # Makefile for Etrax-specific library files.. # - -EXTRA_AFLAGS := -traditional - lib-y = checksum.o checksumcopy.o string.o usercopy.o memset.o csumcpfruser.o
arch/x86/Kconfig +14 -0
@@ -75,6 +75,7 @@ config X86 select HAVE_BPF_JIT if (X86_64 && NET) select CLKEVT_I8253 select ARCH_HAVE_NMI_SAFE_CMPXCHG + select GENERIC_CPU_VULNERABILITIES select ARCH_SUPPORTS_ATOMIC_RMW config INSTRUCTION_DECODER
@@ -311,6 +312,19 @@ config X86_BIGSMP ---help--- This option is needed for the systems that have more than 8 CPUs +config RETPOLINE + bool "Avoid speculative indirect branches in kernel" + default y + help + Compile kernel with the retpoline compiler options to guard against + kernel-to-user data leaks by avoiding speculative indirect + branches. Requires a compiler with -mindirect-branch=thunk-extern + support for full protection. The kernel may run slower. + + Without compiler support, at least indirect branches in assembler + code are eliminated. Since this includes the syscall entry path, + it is not entirely pointless. + if X86_32 config X86_EXTENDED_PLATFORM bool "Support for extended (non-PC) x86 platforms"
arch/x86/Makefile +8 -0
@@ -117,6 +117,14 @@ KBUILD_CFLAGS += $(call cc-option,-mno-sse -mno-mmx -mno-sse2 -mno-3dnow,) KBUILD_CFLAGS += $(mflags-y) KBUILD_AFLAGS += $(mflags-y) +# Avoid indirect branches in kernel to deal with Spectre +ifdef CONFIG_RETPOLINE + RETPOLINE_CFLAGS += $(call cc-option,-mindirect-branch=thunk-extern -mindirect-branch-register) + ifneq ($(RETPOLINE_CFLAGS),) + KBUILD_CFLAGS += $(RETPOLINE_CFLAGS) -DRETPOLINE + endif +endif + archscripts: $(Q)$(MAKE) $(build)=arch/x86/tools relocs
arch/x86/ia32/ia32entry.S +39 -15
119 lines not on this page · raw message
arch/x86/include/asm/alternative-asm.h +17 -2
@@ -1,3 +1,6 @@ +#ifndef _ASM_X86_ALTERNATIVE_ASM_H +#define _ASM_X86_ALTERNATIVE_ASM_H +#ifdef __ASSEMBLY__#include <asm/asm.h>
@@ -42,12 +45,22 @@ .popsection .endm +#define old_len 141b-140b +#define new_len1 144f-143f +#define new_len2 145f-144f + +/* +* max without conditionals. Idea adapted from: +* http://graphics.stanford.edu/~seander/bithacks.html#IntegerMinOrMax +*/ +#define alt_max_short (a, b) ((a) ^ (((a) ^ (b)) & -(-((a) < (b))))) + .macro ALTERNATIVE_2 oldinstr, newinstr1, feature1, newinstr2, feature2 140: \oldinstr 141: - .skip -(((144f-143f)-(141b-140b)) > 0) * ((144f-143f)-(141b-140b)),0x90 - .skip -(((145f -144f )-(144f -143f )-(141b -140b )) >0 ) * ((145f -144f )-(144f -143f )-(141b -140b )),0x90 + .skip -((alt_max_short(new_len1, new_len2) - (old_len)) > 0) * \ + (alt_max_short(new_len1, new_len2) - (old_len)),0x90 142: .pushsection .altinstructions,"a"
@@ -65,3 +78,5 @@ .endm#endif /* __ASSEMBLY__ */ + +#endif /* _ASM_X86_ALTERNATIVE_ASM_H */
arch/x86/include/asm/alternative.h +18 -6
@@ -1,6 +1,8 @@#ifndef _ASM_X86_ALTERNATIVE_H#define _ASM_X86_ALTERNATIVE_H +#ifndef __ASSEMBLY__ +#include <linux/types.h> #include <linux/stddef.h> #include <linux/stringify.h>
@@ -94,14 +96,22 @@ static inline int alternatives_text_reserved(void *start, void *end) __OLDINSTR(oldinstr, num) \ alt_end_marker":\n" +/* +* max without conditionals. Idea adapted from: +* http://graphics.stanford.edu/~seander/bithacks.html#IntegerMinOrMax +* +* The additional "-" is needed because gas works with s32s. + */ +#define alt_max_short (a, b) "((" a ") ^ (((" a ") ^ (" b ")) & -(-((" a ") - (" b ")))))" +/* * Pad the second replacement alternative with additional NOPs if it is * additionally longer than the first replacement alternative. */ -#define OLDINSTR_2 (oldinstr, num1, num2) \ - __OLDINSTR(oldinstr, num1) \ - ".skip -(((" alt_rlen(num2) ")-(" alt_rlen(num1) ")-(662b-661b)) > 0) * " \ - "((" alt_rlen(num2) ")-(" alt_rlen(num1) ")-(662b-661b)),0x90\n" \ +#define OLDINSTR_2 (oldinstr, num1, num2) \ + "661:\n\t" oldinstr "\n662:\n" \ + ".skip -((" alt_max_short(alt_rlen(num1), alt_rlen(num2)) " - (" alt_slen ")) > 0) * " \ + "(" alt_max_short(alt_rlen(num1), alt_rlen(num2)) " - (" alt_slen ")), 0x90\n" \ alt_end_marker ":\n"#define ALTINSTR_ENTRY (feature, num) \
@@ -123,7 +133,7 @@ static inline int alternatives_text_reserved(void *start, void *end)".popsection\n" \".pushsection .altinstr_replacement, \"ax\"\n" \ ALTINSTR_REPLACEMENT(newinstr, feature, 1) \ - ".popsection" + ".popsection\n"#define ALTERNATIVE_2 (oldinstr, newinstr1, feature1, newinstr2, feature2)\ OLDINSTR_2(oldinstr, 1, 2) \
@@ -134,7 +144,7 @@ static inline int alternatives_text_reserved(void *start, void *end)".pushsection .altinstr_replacement, \"ax\"\n" \ ALTINSTR_REPLACEMENT(newinstr1, feature1, 1) \ ALTINSTR_REPLACEMENT(newinstr2, feature2, 2) \ -".popsection" +".popsection\n" /* * This must be included *after* the definition of ALTERNATIVE due to
@@ -232,4 +242,6 @@ extern void *text_poke(void *addr, const void *opcode, size_t len);extern void *text_poke_smp (void *addr,const void *opcode,size_t len);extern void text_poke_smp_batch (struct text_poke_param *params,int n); +#endif /* __ASSEMBLY__ */ +#endif /* _ASM_X86_ALTERNATIVE_H */
arch/x86/include/asm/asm.h +16 -1
@@ -3,23 +3,27 @@#ifdef __ASSEMBLY__# define __ASM_FORM (x) x +# define __ASM_FORM_RAW (x) x# define __ASM_FORM_COMMA (x) x,# define __ASM_EX_SEC .section __ex_table, "a"#else # define __ASM_FORM (x) " " #x " " +# define __ASM_FORM_RAW (x) #x# define __ASM_FORM_COMMA (x) " " #x ","# define __ASM_EX_SEC " .section __ex_table,\"a\"\n"#endif #ifdef CONFIG_X86_32 # define __ASM_SEL (a,b) __ASM_FORM(a) +# define __ASM_SEL_RAW (a,b) __ASM_FORM_RAW(a)#else # define __ASM_SEL (a,b) __ASM_FORM(b) +# define __ASM_SEL_RAW (a,b) __ASM_FORM_RAW(b)#endif #define __ASM_SIZE (inst, ...) __ASM_SEL(inst##l##__VA_ARGS__, \ inst##q##__VA_ARGS__) -#define __ASM_REG (reg) __ASM_SEL(e##reg, r##reg) +#define __ASM_REG (reg) __ASM_SEL_RAW(e##reg, r##reg)#define _ASM_PTR __ASM_SEL(.long, .quad)#define _ASM_ALIGN __ASM_SEL(.balign 4, .balign 8)
@@ -55,4 +59,15 @@ " .previous\n"#endif +#ifndef __ASSEMBLY__ +/* +* This output constraint should be used for any inline asm which has a "call" +* instruction. Otherwise the asm may be inserted before the frame pointer +* gets set up by the containing function. If you forget to do this, objtool +* may print a "call without frame pointer save/setup" warning. +*/ +registerunsigned long current_stack_pointer asm (_ASM_SP ); +#define ASM_CALL_CONSTRAINT "+r" (current_stack_pointer) +#endif +#endif /* _ASM_X86_ASM_H */
arch/x86/include/asm/bitops.h +2 -0
@@ -15,6 +15,8 @@#include <linux/compiler.h> #include <asm/alternative.h> +#define BIT_64 (n) (U64_C(1) << (n)) +/* * These have to be done with inline assembly: that way the bit-setting * is guaranteed to be atomic. All bit operations return 0 if the bit
arch/x86/include/asm/cpufeature.h +22 -0
@@ -7,6 +7,7 @@#include <asm/required-features.h> #define NCAPINTS 10/* N 32-bit words worth of info */ +#define NBUGINTS 1/* N 32-bit bug flags */ /* * Note: If the comment begins with a quoted string, that string is used
@@ -177,7 +178,10 @@#define X86_FEATURE_PTS (7*32+ 6)/* Intel Package Thermal Status */ #define X86_FEATURE_DTHERM (7*32+ 7)/* Digital Thermal Sensor */ #define X86_FEATURE_INVPCID_SINGLE (7*32+ 8)/* Effectively INVPCID && CR4.PCIDE=1 */ +#define X86_FEATURE_RSB_CTXSW (7*32+9)/* "" Fill RSB on context switches */ +#define X86_FEATURE_RETPOLINE (7*32+29)/* "" Generic Retpoline mitigation for Spectre variant 2 */ +#define X86_FEATURE_RETPOLINE_AMD (7*32+30)/* "" AMD Retpoline mitigation for Spectre variant 2 */ /* Because the ALTERNATIVE scheme is for members of the X86_FEATURE club... */ #define X86_FEATURE_KAISER ( 7*32+31)/* "" CONFIG_PAGE_TABLE_ISOLATION w/o nokaiser */
@@ -208,6 +212,15 @@#define X86_FEATURE_INVPCID (9*32+10)/* Invalidate Processor Context ID */ #define X86_FEATURE_RTM (9*32+11)/* Restricted Transactional Memory */ +/* +* BUG word(s) +*/ +#define X86_BUG (x) (NCAPINTS*32 + (x)) + +#define X86_BUG_CPU_MELTDOWN X86_BUG(0)/* CPU is affected by meltdown attack and needs kernel page table isolation */ +#define X86_BUG_SPECTRE_V1 X86_BUG(1)/* CPU is affected by Spectre variant 1 attack with conditional branches */ +#define X86_BUG_SPECTRE_V2 X86_BUG(2)/* CPU is affected by Spectre variant 2 attack with indirect branches */ +#if defined(__KERNEL__) && !defined(__ASSEMBLY__)#include <asm/asm.h>
@@ -252,6 +265,8 @@ extern const char * const x86_power_flags[32];set_bit (bit, (unsigned long *)cpu_caps_set); \ } while (0) +#define setup_force_cpu_bug (bit) setup_force_cpu_cap(bit) +#define cpu_has_fpu boot_cpu_has(X86_FEATURE_FPU)#define cpu_has_vme boot_cpu_has(X86_FEATURE_VME)#define cpu_has_de boot_cpu_has(X86_FEATURE_DE)
@@ -397,6 +412,13 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)#define static_cpu_has (bit) boot_cpu_has(bit)#endif +#define cpu_has_bug (c, bit) cpu_has(c, (bit)) +#define set_cpu_bug (c, bit) set_cpu_cap(c, (bit)) +#define clear_cpu_bug (c, bit) clear_cpu_cap(c, (bit)); + +#define static_cpu_has_bug (bit) static_cpu_has((bit)) +#define boot_cpu_has_bug (bit) cpu_has_bug(&boot_cpu_data, (bit)) +#endif /* defined(__KERNEL__) && !defined(__ASSEMBLY__) */ #endif /* _ASM_X86_CPUFEATURE_H */
arch/x86/include/asm/intel-family.h new file +68 -0
68 lines not on this page · raw message
arch/x86/include/asm/msr-index.h +3 -0
@@ -150,6 +150,9 @@#define FAM10H_MMIO_CONF_BASE_MASK 0xfffffffULL#define FAM10H_MMIO_CONF_BASE_SHIFT 20#define MSR_FAM10H_NODE_ID 0xc001100c +#define MSR_F10H_DECFG 0xc0011029 +#define MSR_F10H_DECFG_LFENCE_SERIALIZE_BIT 1 +#define MSR_F10H_DECFG_LFENCE_SERIALIZE BIT_ULL(MSR_F10H_DECFG_LFENCE_SERIALIZE_BIT)/* K8 MSRs */ #define MSR_K8_TOP_MEM1 0xc001001a
arch/x86/include/asm/msr.h +2 -0
@@ -265,6 +265,8 @@ do { \struct msr *msrs_alloc (void );void msrs_free (struct msr *msrs); +int msr_set_bit (u32 msr,u8 bit); +int msr_clear_bit (u32 msr,u8 bit);#ifdef CONFIG_SMP int rdmsr_on_cpu (unsigned int cpu,u32 msr_no,u32 *l,u32 *h);
arch/x86/include/asm/nospec-branch.h new file +199 -0
199 lines not on this page · raw message
arch/x86/include/asm/processor.h +3 -3
@@ -86,7 +86,7 @@ struct cpuinfo_x86 {__u32 extended_cpuid_level;/* Maximum supported CPUID level, -1=no CPUID: */ int cpuid_level; -__u32 x86_capability[NCAPINTS ]; +__u32 x86_capability[NCAPINTS +NBUGINTS ];char x86_vendor_id[16 ];char x86_model_id[64 ];/* in KB - valid for CPUS which support this call: */
@@ -130,8 +130,8 @@ extern struct cpuinfo_x86 boot_cpu_data;extern struct cpuinfo_x86 new_cpu_data;extern struct tss_struct doublefault_tss; -extern __u32 cpu_caps_cleared[NCAPINTS ]; -extern __u32 cpu_caps_set[NCAPINTS ]; +extern __u32 cpu_caps_cleared[NCAPINTS +NBUGINTS ]; +extern __u32 cpu_caps_set[NCAPINTS +NBUGINTS ];#ifdef CONFIG_SMP DECLARE_PER_CPU_SHARED_ALIGNED(struct cpuinfo_x86, cpu_info);
arch/x86/include/asm/system.h +66 -2
110 lines not on this page · raw message
arch/x86/include/asm/thread_info.h +0 -3
@@ -181,9 +181,6 @@ struct thread_info {#ifndef __ASSEMBLY__ -/* how to get the current stack pointer from C */ -registerunsigned long current_stack_pointer asm("esp" )__used ; -/* how to get the thread information struct from C */ static inline struct thread_info *current_thread_info (void ) {
arch/x86/include/asm/uaccess.h +7 -1
@@ -423,6 +423,7 @@ do { \ ({ \ int __gu_err; \ unsigned long __gu_val; \ + barrier_nospec(); \ __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \ (x) = (__force __typeof__(*(ptr)))__gu_val; \ __gu_err; \
@@ -462,6 +463,11 @@ struct __large_struct { unsigned long buf[100]; };current_thread_info ()->uaccess_err =0 ; \barrier (); +#define uaccess_try_nospec do { \ + int prev_err = current_thread_info()->uaccess_err; \ + current_thread_info()->uaccess_err = 0; \ + barrier_nospec(); +#define uaccess_catch (err) \ (err) |= current_thread_info()->uaccess_err; \ current_thread_info()->uaccess_err = prev_err; \
@@ -524,7 +530,7 @@ struct __large_struct { unsigned long buf[100]; };* get_user_ex(...); * } get_user_catch(err) */ -#define get_user_try uaccess_try +#define get_user_try uaccess_try_nospec#define get_user_catch (err) uaccess_catch(err)#define get_user_ex (x, ptr) do { \
arch/x86/include/asm/uaccess_32.h +12 -0
@@ -48,14 +48,17 @@ __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)switch (n) {case 1 : +barrier_nospec ();__put_user_size (*(u8 *)from, (u8 __user *)to,1 , ret,1 );return ret;case 2 : +barrier_nospec ();__put_user_size (*(u16 *)from, (u16 __user *)to,2 , ret,2 );return ret;case 4 : +barrier_nospec ();__put_user_size (*(u32 *)from, (u32 __user *)to,4 , ret,4 );return ret;
@@ -98,12 +101,15 @@ __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)switch (n) {case 1 : +barrier_nospec ();__get_user_size (*(u8 *)to, from,1 , ret,1 );return ret;case 2 : +barrier_nospec ();__get_user_size (*(u16 *)to, from,2 , ret,2 );return ret;case 4 : +barrier_nospec ();__get_user_size (*(u32 *)to, from,4 , ret,4 );return ret; }
@@ -142,12 +148,15 @@ __copy_from_user(void *to, const void __user *from, unsigned long n)switch (n) {case 1 : +barrier_nospec ();__get_user_size (*(u8 *)to, from,1 , ret,1 );return ret;case 2 : +barrier_nospec ();__get_user_size (*(u16 *)to, from,2 , ret,2 );return ret;case 4 : +barrier_nospec ();__get_user_size (*(u32 *)to, from,4 , ret,4 );return ret; }
@@ -164,12 +173,15 @@ static __always_inline unsigned long __copy_from_user_nocache(void *to,switch (n) {case 1 : +barrier_nospec ();__get_user_size (*(u8 *)to, from,1 , ret,1 );return ret;case 2 : +barrier_nospec ();__get_user_size (*(u16 *)to, from,2 , ret,2 );return ret;case 4 : +barrier_nospec ();__get_user_size (*(u32 *)to, from,4 , ret,4 );return ret; }
arch/x86/include/asm/uaccess_64.h +18 -4
@@ -75,19 +75,28 @@ int __copy_from_user_nocheck(void *dst, const void __user *src, unsigned size)if (!__builtin_constant_p (size))return copy_user_generic (dst, (__force void *)src, size);switch (size) { -case 1 :__get_user_asm (*(u8 *)dst, (u8 __user *)src, +case 1 : +barrier_nospec (); +__get_user_asm (*(u8 *)dst, (u8 __user *)src, ret,"b" ,"b" ,"=q" ,1 );return ret; -case 2 :__get_user_asm (*(u16 *)dst, (u16 __user *)src, +case 2 : +barrier_nospec (); +__get_user_asm (*(u16 *)dst, (u16 __user *)src, ret,"w" ,"w" ,"=r" ,2 );return ret; -case 4 :__get_user_asm (*(u32 *)dst, (u32 __user *)src, +case 4 : +barrier_nospec (); +__get_user_asm (*(u32 *)dst, (u32 __user *)src, ret,"l" ,"k" ,"=r" ,4 );return ret; -case 8 :__get_user_asm (*(u64 *)dst, (u64 __user *)src, +case 8 : +barrier_nospec (); +__get_user_asm (*(u64 *)dst, (u64 __user *)src, ret,"q" ,"" ,"=r" ,8 );return ret;case 10 : +barrier_nospec ();__get_user_asm (*(u64 *)dst, (u64 __user *)src, ret,"q" ,"" ,"=r" ,10 );if (unlikely (ret))
@@ -97,6 +106,7 @@ int __copy_from_user_nocheck(void *dst, const void __user *src, unsigned size) ret, "w", "w", "=r", 2);return ret;case 16 : +barrier_nospec ();__get_user_asm (*(u64 *)dst, (u64 __user *)src, ret,"q" ,"" ,"=r" ,16 );if (unlikely (ret))
@@ -179,6 +189,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)switch (size) {case 1 : {u8 tmp; +barrier_nospec ();__get_user_asm (tmp, (u8 __user *)src, ret,"b" ,"b" ,"=q" ,1 );if (likely (!ret))
@@ -188,6 +199,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size) }case 2 : {u16 tmp; +barrier_nospec ();__get_user_asm (tmp, (u16 __user *)src, ret,"w" ,"w" ,"=r" ,2 );if (likely (!ret))
@@ -198,6 +210,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)case 4 : {u32 tmp; +barrier_nospec ();__get_user_asm (tmp, (u32 __user *)src, ret,"l" ,"k" ,"=r" ,4 );if (likely (!ret))
@@ -207,6 +220,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size) }case 8 : {u64 tmp; +barrier_nospec ();__get_user_asm (tmp, (u64 __user *)src, ret,"q" ,"" ,"=r" ,8 );if (likely (!ret))
arch/x86/include/asm/xen/hypercall.h +3 -2
@@ -43,6 +43,7 @@#include <asm/page.h> #include <asm/pgtable.h> +#include <asm/nospec-branch.h> #include <xen/interface/xen.h> #include <xen/interface/sched.h>
@@ -212,9 +213,9 @@ privcmd_call(unsigned call, __HYPERCALL_DECLS;__HYPERCALL_5ARG (a1, a2, a3, a4, a5); - asmvolatile ("call *%[call]" + asmvolatile (CALL_NOSPEC : __HYPERCALL_5PARAM - : [call]"a" (&hypercall_page[call]) + : [thunk_target] "a" (&hypercall_page[call]) : __HYPERCALL_CLOBBER5);return (long )__res;
arch/x86/kernel/alternative.c +14 -17
@@ -39,17 +39,6 @@ static int __init setup_noreplace_smp(char *str) }__setup ("noreplace-smp" , setup_noreplace_smp); -#ifdef CONFIG_PARAVIRT -static int __initdata_or_module noreplace_paravirt = 0; - -static int __init setup_noreplace_paravirt (char *str) -{ - noreplace_paravirt =1 ; -return 1 ; -} -__setup ("noreplace-paravirt" , setup_noreplace_paravirt); -#endif - #define DPRINTK(fmt, args...) \ do { \ if (debug_alternative) \
@@ -323,7 +312,18 @@ recompute_jump(struct alt_instr *a, u8 *orig_insn, u8 *repl_insn, u8 *insnbuf) static void __init_or_module optimize_nops(struct alt_instr *a, u8 *instr) { +unsigned long flags; +int i; + +for (i =0 ; i < a->padlen; i++) { +if (instr[i] !=0x90 ) +return ; + } + +local_irq_save (flags);add_nops (instr + (a->instrlen - a->padlen), a->padlen); +sync_core (); +local_irq_restore (flags);DUMP_BYTES (instr, a->instrlen,"%p: [%d:%d) optimized NOPs: " , instr, a->instrlen - a->padlen, a->padlen);
@@ -359,7 +359,7 @@ void __init_or_module apply_alternatives(struct alt_instr *start, instr = (u8 *)&a->instr_offset + a->instr_offset; replacement = (u8 *)&a->repl_offset + a->repl_offset;BUG_ON (a->instrlen >sizeof (insnbuf)); -BUG_ON (a->cpuid >=NCAPINTS *32 ); +BUG_ON (a->cpuid >= (NCAPINTS +NBUGINTS ) *32 );if (!boot_cpu_has (a->cpuid)) {if (a->padlen >1 )optimize_nops (a, instr);
@@ -367,11 +367,11 @@ void __init_or_module apply_alternatives(struct alt_instr *start,continue ; } -DPRINTK ("feat: %d*32+%d, old: (%p, len: %d), repl: (%p, len: %d)" , +DPRINTK ("feat: %d*32+%d, old: (%p, len: %d), repl: (%p, len: %d), pad: %d" , a->cpuid >>5 , a->cpuid &0x1f , instr, a->instrlen, - replacement, a->replacementlen); + replacement, a->replacementlen, a->padlen);DUMP_BYTES (instr, a->instrlen,"%p: old_insn: " , instr);DUMP_BYTES (replacement, a->replacementlen,"%p: rpl_insn: " , replacement);
@@ -572,9 +572,6 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,struct paravirt_patch_site *p;char insnbuf[MAX_PATCH_LEN ]; -if (noreplace_paravirt) -return ; -for (p = start; p < end; p++) {unsigned int used;
arch/x86/kernel/cpu/Makefile +1 -3
@@ -16,9 +16,7 @@ obj-y := intel_cacheinfo.o scattered.o topology.o obj-y += proc.o capflags.o powerflags.o common.o obj-y += vmware.o hypervisor.o sched.o mshyperv.o obj-y += rdrand.o - -obj-$(CONFIG_X86_32) += bugs.o -obj-$(CONFIG_X86_64) += bugs_64.o +obj-y += bugs.o obj-$(CONFIG_CPU_SUP_INTEL) += intel.o obj-$(CONFIG_CPU_SUP_AMD) += amd.o
arch/x86/kernel/cpu/amd.c +26 -2
@@ -641,8 +641,32 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)set_cpu_cap (c,X86_FEATURE_K8 );if (cpu_has_xmm2) { -/* MFENCE stops RDTSC speculation */ -set_cpu_cap (c,X86_FEATURE_MFENCE_RDTSC ); +unsigned long long val; +int ret; + +/* +* A serializing LFENCE has less overhead than MFENCE, so +* use it for execution serialization. On families which +* don't have that MSR, LFENCE is already serializing. +* msr_set_bit() uses the safe accessors, too, even if the MSR +* is not present. +*/ +msr_set_bit (MSR_F10H_DECFG , +MSR_F10H_DECFG_LFENCE_SERIALIZE_BIT ); + +/* +* Verify that the MSR write was successful (could be running +* under a hypervisor) and only then assume that LFENCE is +* serializing. +*/ + ret =rdmsrl_safe (MSR_F10H_DECFG , &val); +if (!ret && (val &MSR_F10H_DECFG_LFENCE_SERIALIZE )) { +/* A serializing LFENCE stops RDTSC speculation */ +set_cpu_cap (c,X86_FEATURE_LFENCE_RDTSC ); + }else { +/* MFENCE stops RDTSC speculation */ +set_cpu_cap (c,X86_FEATURE_MFENCE_RDTSC ); + } }#ifdef CONFIG_X86_64
arch/x86/kernel/cpu/bugs.c +295 -4
327 lines not on this page · raw message
arch/x86/kernel/cpu/bugs_64.c deleted +0 -33
@@ -1,33 +0,0 @@ -/* -* Copyright (C) 1994 Linus Torvalds -* Copyright (C) 2000 SuSE -*/ - -#include <linux/kernel.h> -#include <linux/init.h> -#include <asm/alternative.h> -#include <asm/bugs.h> -#include <asm/processor.h> -#include <asm/mtrr.h> -#include <asm/cacheflush.h> - -void __init check_bugs (void ) -{ -identify_boot_cpu (); -#if !defined(CONFIG_SMP ) -printk (KERN_INFO "CPU: " ); -print_cpu_info (&boot_cpu_data); -#endif -alternative_instructions (); - -/* -* Make sure the first 2MB area is not mapped by huge pages -* There are typically fixed size MTRRs in there and overlapping -* MTRRs into large pages causes slow downs. -* -* Right now we don't do that with gbpages because there seems -* very little benefit for that case. -*/ -if (!direct_gbpages) -set_memory_4k ((unsigned long )__va (0 ),1 ); -}
arch/x86/kernel/cpu/common.c +24 -10
@@ -424,8 +424,8 @@ static const char *__cpuinit table_lookup_model(struct cpuinfo_x86 *c)return NULL ;/* Not found */ } -__u32 cpu_caps_cleared[NCAPINTS ]__cpuinitdata ; -__u32 cpu_caps_set[NCAPINTS ]__cpuinitdata ; +__u32 cpu_caps_cleared[NCAPINTS +NBUGINTS ]__cpuinitdata ; +__u32 cpu_caps_set[NCAPINTS +NBUGINTS ]__cpuinitdata ;void load_percpu_segment (int cpu) {
@@ -632,6 +632,16 @@ void __cpuinit cpu_detect(struct cpuinfo_x86 *c) } } +static void apply_forced_caps (struct cpuinfo_x86 *c) +{ +int i; + +for (i =0 ; i <NCAPINTS +NBUGINTS ; i++) { + c->x86_capability[i] &= ~cpu_caps_cleared[i]; + c->x86_capability[i] |= cpu_caps_set[i]; + } +} +void __cpuinit get_cpu_cap (struct cpuinfo_x86 *c) {u32 tfms, xlvl;
@@ -757,6 +767,12 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c)if (this_cpu->c_bsp_init) this_cpu->c_bsp_init (c); + +if (c->x86_vendor !=X86_VENDOR_AMD ) +setup_force_cpu_bug (X86_BUG_CPU_MELTDOWN ); + +setup_force_cpu_bug (X86_BUG_SPECTRE_V1 ); +setup_force_cpu_bug (X86_BUG_SPECTRE_V2 ); }void __init early_cpu_init (void )
@@ -880,10 +896,7 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c) this_cpu->c_identify (c);/* Clear/Set all flags overriden by options, after probe */ -for (i =0 ; i <NCAPINTS ; i++) { - c->x86_capability[i] &= ~cpu_caps_cleared[i]; - c->x86_capability[i] |= cpu_caps_set[i]; - } +apply_forced_caps (c);#ifdef CONFIG_X86_64 c->apicid = apic->phys_pkg_id (c->initial_apicid,0 );
@@ -939,10 +952,7 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)* Clear/Set all flags overriden by options, need do it * before following smp all cpus cap AND. */ -for (i =0 ; i <NCAPINTS ; i++) { - c->x86_capability[i] &= ~cpu_caps_cleared[i]; - c->x86_capability[i] |= cpu_caps_set[i]; - } +apply_forced_caps (c);/* * On SMP, boot_cpu_data holds the common feature set between
@@ -954,6 +964,10 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)/* AND the already accumulated flags with these */ for (i =0 ; i <NCAPINTS ; i++) boot_cpu_data.x86_capability[i] &= c->x86_capability[i]; + +/* OR, i.e. replicate the bug flags */ +for (i =NCAPINTS ; i <NCAPINTS +NBUGINTS ; i++) + c->x86_capability[i] |= boot_cpu_data.x86_capability[i]; }/* Init Machine Check Exception if available. */
arch/x86/kernel/entry_32.S +20 -4
@@ -55,6 +55,7 @@ #include <asm/irq_vectors.h> #include <asm/cpufeature.h> #include <asm/alternative-asm.h> +#include <asm/nospec-branch.h> /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */ #include <linux/elf-em.h>
@@ -428,7 +429,14 @@ ENTRY(ia32_sysenter_target) sysenter_do_call: cmpl $(nr_syscalls), %eax jae sysenter_badsys + sbb %edx, %edx /* array_index_mask_nospec() */ + and %edx, %eax +#ifdef CONFIG_RETPOLINE + movl sys_call_table(,%eax,4),%eax + call __x86_indirect_thunk_eax +#else call *sys_call_table(,%eax,4) +#endif sysenter_after_call: movl %eax,PT_EAX(%esp) LOCKDEP_SYS_EXIT
@@ -511,7 +519,14 @@ ENTRY(system_call) cmpl $(nr_syscalls), %eax jae syscall_badsys syscall_call: + sbb %edx, %edx /* array_index_mask_nospec() */ + and %edx, %eax +#ifdef CONFIG_RETPOLINE + movl sys_call_table(,%eax,4),%eax + call __x86_indirect_thunk_eax +#else call *sys_call_table(,%eax,4) +#endif syscall_after_call: movl %eax,PT_EAX(%esp) # store the return value syscall_exit:
@@ -1017,7 +1032,7 @@ ENTRY(kernel_thread_helper) pushl $0 # fake return address for unwinder CFI_STARTPROC movl %edi,%eax - call *%esi + CALL_NOSPEC %esi call do_exit ud2 # padding for call trace CFI_ENDPROC
@@ -1182,7 +1197,8 @@ ENTRY(mcount) movl 0x4(%ebp), %edx subl $MCOUNT_INSN_SIZE, %eax - call *ftrace_trace_function + movl ftrace_trace_function, %ecx + CALL_NOSPEC %ecx popl %edx popl %ecx
@@ -1220,7 +1236,7 @@ END(ftrace_graph_caller) movl %eax, %ecx popl %edx popl %eax - jmp *%ecx + JMP_NOSPEC %ecx #endif .section .rodata,"a"
@@ -1274,7 +1290,7 @@ ENTRY(page_fault) movl %ecx, %es TRACE_IRQS_OFF movl %esp,%eax # pt_regs pointer - call *%edi + CALL_NOSPEC %edi jmp ret_from_exception CFI_ENDPROC END(page_fault)
arch/x86/kernel/entry_64.S +23 -8
@@ -59,6 +59,7 @@ #include <asm/alternative-asm.h> #include <asm/cpufeature.h> #include <asm/kaiser.h> +#include <asm/nospec-branch.h> /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */ #include <linux/elf-em.h>
@@ -125,8 +126,8 @@ GLOBAL(ftrace_stub) movq 8(%rbp), %rsi subq $MCOUNT_INSN_SIZE, %rdi - call *ftrace_trace_function - + movq ftrace_trace_function, %r8 + CALL_NOSPEC %r8 MCOUNT_RESTORE_FRAME jmp ftrace_stub
@@ -167,7 +168,7 @@ GLOBAL(return_to_handler) movq 8(%rsp), %rdx movq (%rsp), %rax addq $24, %rsp - jmp *%rdi + JMP_NOSPEC %rdi #endif
@@ -516,10 +517,17 @@ ENTRY(system_call_after_swapgs) testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%rcx) jnz tracesys system_call_fastpath: - cmpq $__NR_syscall_max,%rax - ja badsys + cmpq $NR_syscalls, %rax + jae badsys + sbb %rcx, %rcx /* array_index_mask_nospec() */ + and %rcx, %rax movq %r10,%rcx +#ifdef CONFIG_RETPOLINE + movq sys_call_table(, %rax, 8), %rax + call __x86_indirect_thunk_rax +#else call *sys_call_table(,%rax,8) # XXX: rip relative +#endif movq %rax,RAX-ARGOFFSET(%rsp) /* * Syscall return path ending with SYSRET (fast path)
@@ -640,10 +648,17 @@ ENTRY(system_call_after_swapgs) */ LOAD_ARGS ARGOFFSET, 1 RESTORE_REST - cmpq $__NR_syscall_max,%rax - ja int_ret_from_sys_call /* RAX(%rsp) set to -ENOSYS above */ + cmpq $NR_syscalls, %rax + jae int_ret_from_sys_call /* RAX(%rsp) set to -ENOSYS above */ + sbb %rcx, %rcx /* array_index_mask_nospec() */ + and %rcx, %rax movq %r10,%rcx /* fixup for C */ +#ifdef CONFIG_RETPOLINE + movq sys_call_table(, %rax, 8), %rax + call __x86_indirect_thunk_rax +#else call *sys_call_table(,%rax,8) +#endif movq %rax,RAX-ARGOFFSET(%rsp) /* Use IRET because user could have changed frame */
@@ -1219,7 +1234,7 @@ ENTRY(kernel_thread_helper) * Here we are in the child and the registers are set as they were * at kernel_thread() invocation in the parent. */ - call *%rsi + CALL_NOSPEC %rsi # exit mov %eax, %edi call do_exit
arch/x86/kernel/irq_32.c +5 -4
@@ -20,6 +20,7 @@#include <linux/mm.h> #include <asm/apic.h> +#include <asm/nospec-branch.h> DEFINE_PER_CPU_SHARED_ALIGNED (irq_cpustat_t, irq_stat);EXPORT_PER_CPU_SYMBOL (irq_stat);
@@ -64,11 +65,11 @@ static DEFINE_PER_CPU(union irq_ctx *, softirq_ctx);static void call_on_stack (void *func,void *stack) { asmvolatile ("xchgl %%ebx,%%esp \n" -"call *%%edi \n" +CALL_NOSPEC "movl %%ebx,%%esp \n" :"=b" (stack) :"0" (stack), -"D" (func) + [thunk_target]"D" (func) :"memory" ,"cc" ,"edx" ,"ecx" ,"eax" ); }
@@ -107,11 +108,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)call_on_stack (print_stack_overflow, isp); asmvolatile ("xchgl %%ebx,%%esp \n" -"call *%%edi \n" +CALL_NOSPEC "movl %%ebx,%%esp \n" :"=a" (arg1),"=d" (arg2),"=b" (isp) :"0" (irq),"1" (desc),"2" (isp), -"D" (desc->handle_irq) + [thunk_target]"D" (desc->handle_irq) :"memory" ,"cc" ,"ecx" );return 1 ; }
arch/x86/kernel/kprobes.c +22 -1
@@ -58,6 +58,7 @@#include <asm/alternative.h> #include <asm/insn.h> #include <asm/debugreg.h> +#include <asm/nospec-branch.h> void jprobe_return_end (void );
@@ -1256,7 +1257,7 @@ static int __kprobes copy_optimized_instructions(u8 *dest, u8 *src) }/* Check whether insn is indirect jump */ -static int __kprobes insn_is_indirect_jump (struct insn *insn) +static int __kprobes __insn_is_indirect_jump (struct insn *insn) { return ((insn->opcode.bytes[0] == 0xff && (X86_MODRM_REG(insn->modrm.value) & 6) == 4) || /* Jump */
@@ -1290,6 +1291,26 @@ static int insn_jump_into_range(struct insn *insn, unsigned long start, int len)return (start <= target && target <= start + len); } +static int __kprobes insn_is_indirect_jump (struct insn *insn) +{ +int ret =__insn_is_indirect_jump (insn); + +#ifdef CONFIG_RETPOLINE +/* +* Jump to x86_indirect_thunk_* is treated as an indirect jump. +* Note that even with CONFIG_RETPOLINE=y, the kernel compiled with +* older gcc may use indirect jump. So we add this check instead of +* replace indirect-jump check. +*/ +if (!ret) + ret =insn_jump_into_range (insn, + (unsigned long )__indirect_thunk_start, + (unsigned long )__indirect_thunk_end - + (unsigned long )__indirect_thunk_start); +#endif +return ret; +} +/* Decode whole function to ensure any instructions don't jump into target */ static int __kprobes can_optimize (unsigned long paddr) {
arch/x86/kernel/vmlinux.lds.S +7 -0
@@ -108,6 +108,13 @@ SECTIONS IRQENTRY_TEXT *(.fixup) *(.gnu.warning) +#ifdef CONFIG_RETPOLINE + __indirect_thunk_start = .; + *(.text.__x86.indirect_thunk) + __indirect_thunk_end = .; + __indirect_thunk_size = __indirect_thunk_end - __indirect_thunk_start; +#endif + /* End of text section */ _etext = .; } :text = 0x9090
arch/x86/kvm/svm.c +43 -26
121 lines not on this page · raw message
arch/x86/kvm/vmx.c +58 -52
192 lines not on this page · raw message
arch/x86/lib/Makefile +2 -0
@@ -23,6 +23,8 @@ lib-y += memcpy_$(BITS).o lib-$(CONFIG_SMP) += rwlock.o lib-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem.o lib-$(CONFIG_INSTRUCTION_DECODER) += insn.o inat.o +lib-$(CONFIG_RETPOLINE) += retpoline.o +obj-$(CONFIG_RETPOLINE) += retpoline-export.o obj-y += msr.o msr-reg.o msr-reg-export.o
arch/x86/lib/checksum_32.S +4 -3
@@ -28,7 +28,8 @@ #include <linux/linkage.h> #include <asm/dwarf2.h> #include <asm/errno.h> - +#include <asm/nospec-branch.h> + /* * computes a partial checksum, e.g. for TCP/UDP fragments */
@@ -164,7 +165,7 @@ ENTRY(csum_partial) negl %ebx lea 45f(%ebx,%ebx,2), %ebx testl %esi, %esi - jmp *%ebx + JMP_NOSPEC %ebx # Handle 2-byte-aligned regions 20: addw (%esi), %ax
@@ -466,7 +467,7 @@ ENTRY(csum_partial_copy_generic) andl $-32,%edx lea 3f(%ebx,%ebx), %ebx testl %esi, %esi - jmp *%ebx + JMP_NOSPEC %ebx 1: addl $64,%esi addl $64,%edi SRC(movb -32(%edx),%bl) ; SRC(movb (%edx),%bl)
arch/x86/lib/getuser.S +8 -0
@@ -40,6 +40,8 @@ ENTRY(__get_user_1) GET_THREAD_INFO(%_ASM_DX) cmp TI_addr_limit(%_ASM_DX),%_ASM_AX jae bad_get_user + sbb %_ASM_DX, %_ASM_DX /* array_index_mask_nospec() */ + and %_ASM_DX, %_ASM_AX 1: movzb (%_ASM_AX),%edx xor %eax,%eax ret
@@ -53,6 +55,8 @@ ENTRY(__get_user_2) GET_THREAD_INFO(%_ASM_DX) cmp TI_addr_limit(%_ASM_DX),%_ASM_AX jae bad_get_user + sbb %_ASM_DX, %_ASM_DX /* array_index_mask_nospec() */ + and %_ASM_DX, %_ASM_AX 2: movzwl -1(%_ASM_AX),%edx xor %eax,%eax ret
@@ -66,6 +70,8 @@ ENTRY(__get_user_4) GET_THREAD_INFO(%_ASM_DX) cmp TI_addr_limit(%_ASM_DX),%_ASM_AX jae bad_get_user + sbb %_ASM_DX, %_ASM_DX /* array_index_mask_nospec() */ + and %_ASM_DX, %_ASM_AX 3: mov -3(%_ASM_AX),%edx xor %eax,%eax ret
@@ -80,6 +86,8 @@ ENTRY(__get_user_8) GET_THREAD_INFO(%_ASM_DX) cmp TI_addr_limit(%_ASM_DX),%_ASM_AX jae bad_get_user + sbb %_ASM_DX, %_ASM_DX /* array_index_mask_nospec() */ + and %_ASM_DX, %_ASM_AX 4: movq -7(%_ASM_AX),%_ASM_DX xor %eax,%eax ret
arch/x86/lib/msr.c +88 -1
98 lines not on this page · raw message
arch/x86/lib/retpoline-export.c new file +25 -0
@@ -0,0 +1,25 @@ +#include <linux/export.h> +#include <linux/linkage.h> + +#ifdef CONFIG_RETPOLINE +#ifdef CONFIG_X86_32 +#define INDIRECT_THUNK (reg) extern asmlinkage void __x86_indirect_thunk_e ## reg(void); EXPORT_SYMBOL(__x86_indirect_thunk_e ## reg); +#else +#define INDIRECT_THUNK (reg) extern asmlinkage void __x86_indirect_thunk_r ## reg(void); EXPORT_SYMBOL(__x86_indirect_thunk_r ## reg); +INDIRECT_THUNK(8) +INDIRECT_THUNK(9) +INDIRECT_THUNK(10) +INDIRECT_THUNK(11) +INDIRECT_THUNK(12) +INDIRECT_THUNK(13) +INDIRECT_THUNK(14) +INDIRECT_THUNK(15) +#endif +INDIRECT_THUNK(ax) +INDIRECT_THUNK(bx) +INDIRECT_THUNK(cx) +INDIRECT_THUNK(dx) +INDIRECT_THUNK(si) +INDIRECT_THUNK(di) +INDIRECT_THUNK(bp) +#endif /* CONFIG_RETPOLINE */
arch/x86/lib/retpoline.S new file +45 -0
45 lines not on this page · raw message
arch/x86/lib/usercopy_32.c +5 -0
@@ -774,6 +774,7 @@ unsigned long __copy_to_user_ll(void __user *to, const void *from, return n; }#endif +barrier_nospec ();if (movsl_is_ok (to, from, n))__copy_user (to, from, n);else
@@ -785,6 +786,7 @@ EXPORT_SYMBOL(__copy_to_user_ll);unsigned long __copy_from_user_ll (void *to,const void __user *from,unsigned long n) { +barrier_nospec ();if (movsl_is_ok (to, from, n))__copy_user_zeroing (to, from, n);else
@@ -796,6 +798,7 @@ EXPORT_SYMBOL(__copy_from_user_ll);unsigned long __copy_from_user_ll_nozero (void *to,const void __user *from,unsigned long n) { +barrier_nospec ();if (movsl_is_ok (to, from, n))__copy_user (to, from, n);else
@@ -808,6 +811,7 @@ EXPORT_SYMBOL(__copy_from_user_ll_nozero);unsigned long __copy_from_user_ll_nocache (void *to,const void __user *from,unsigned long n) { +barrier_nospec ();#ifdef CONFIG_X86_INTEL_USERCOPY if (n >64 && cpu_has_xmm2) n =__copy_user_zeroing_intel_nocache (to, from, n);
@@ -823,6 +827,7 @@ EXPORT_SYMBOL(__copy_from_user_ll_nocache);unsigned long __copy_from_user_ll_nocache_nozero (void *to,const void __user *from,unsigned long n) { +barrier_nospec ();#ifdef CONFIG_X86_INTEL_USERCOPY if (n >64 && cpu_has_xmm2) n =__copy_user_intel_nocache (to, from, n);
drivers/base/Kconfig +3 -0
@@ -172,6 +172,9 @@ config SYS_HYPERVISOR bool default n +config GENERIC_CPU_VULNERABILITIES + bool + source "drivers/base/regmap/Kconfig" endmenu
drivers/base/cpu.c +49 -0
61 lines not on this page · raw message
drivers/edac/mce_amd.h +0 -2
@@ -5,8 +5,6 @@#include <asm/mce.h> -#define BIT_64 (n) (U64_C(1) << (n)) -#define EC (x) ((x) & 0xffff)#define XEC (x, mask) (((x) >> 16) & mask)
drivers/hv/hv.c +16 -9
@@ -27,6 +27,7 @@#include <linux/vmalloc.h> #include <linux/hyperv.h> #include <asm/hyperv.h> +#include <asm/nospec-branch.h> #include "hyperv_vmbus.h" /* The one and only */
@@ -113,10 +114,13 @@ static u64 do_hypercall(u64 control, void *input, void *output)u64 output_address = (output) ?virt_to_phys (output) :0 ;void *hypercall_page = hv_context.hypercall_page; - __asm__ __volatile__("mov %0, %%r8" : :"r" (output_address) :"r8" ); - __asm__ __volatile__("call *%3" :"=a" (hv_status) : -"c" (control),"d" (input_address), -"m" (hypercall_page)); + __asm__ __volatile__("mov %4, %%r8\n" +CALL_NOSPEC + : "=a" (hv_status), ASM_CALL_CONSTRAINT, +"+c" (control),"+d" (input_address) + : "r" (output_address), + THUNK_TARGET(hypercall_page) + :"cc" ,"memory" ,"r8" ,"r9" ,"r10" ,"r11" );return hv_status;
@@ -134,11 +138,14 @@ static u64 do_hypercall(u64 control, void *input, void *output)u32 output_address_lo = output_address &0xFFFFFFFF ;void *hypercall_page = hv_context.hypercall_page; - __asm__ __volatile__ ("call *%8" :"=d" (hv_status_hi), -"=a" (hv_status_lo) :"d" (control_hi), -"a" (control_lo),"b" (input_address_hi), -"c" (input_address_lo),"D" (output_address_hi), -"S" (output_address_lo),"m" (hypercall_page)); + __asm__ __volatile__(CALL_NOSPEC + : "=d" (hv_status_hi), "=a" (hv_status_lo), + "+c" (input_address_lo), ASM_CALL_CONSTRAINT + : "d" (control_hi), "a" (control_lo), + "b" (input_address_hi), + "D"(output_address_hi), "S"(output_address_lo), + THUNK_TARGET(hypercall_page) + : "cc", "memory");return hv_status_lo | ((u64 )hv_status_hi <<32 );#endif /* !x86_64 */
drivers/media/common/tuners/max2165.c +6 -3
@@ -168,7 +168,7 @@ int fixpt_div32(u32 dividend, u32 divisor, u32 *quotient, u32 *fraction)int i;if (0 == divisor) -return -1 ; +return -EINVAL ; q = dividend / divisor; remainder = dividend - q * divisor;
@@ -194,10 +194,13 @@ static int max2165_set_rf(struct max2165_priv *priv, u32 freq)u8 tf_ntch;u32 t;u32 quotient, fraction; +int ret;/* Set PLL divider according to RF frequency */ -fixpt_div32 (freq /1000 , priv->config->osc_clk *1000 , - "ient, &fraction); + ret =fixpt_div32 (freq /1000 , priv->config->osc_clk *1000 , + "ient, &fraction); +if (ret !=0 ) +return ret;/* 20-bit fraction */ fraction >>=12 ;
drivers/media/dvb/frontends/tda8261_cfg.h +1 -1
@@ -78,7 +78,7 @@ static int tda8261_get_bandwidth(struct dvb_frontend *fe, u32 *bandwidth)return err; } *bandwidth = t_state.bandwidth; +printk ("%s: Bandwidth=%d\n" , __func__, t_state.bandwidth); } -printk ("%s: Bandwidth=%d\n" , __func__, t_state.bandwidth);return 0 ; }
drivers/net/ethernet/realtek/atp.c +2 -56
82 lines not on this page · raw message
drivers/net/ethernet/realtek/atp.h +0 -2
@@ -16,8 +16,6 @@ struct rx_header {#define PAR_STATUS 1#define PAR_CONTROL 2 -enum chip_type {RTL8002 ,RTL8012 }; -#define Ctrl_LNibRead 0x08/* LP_PSELECP */ #define Ctrl_HNibRead 0#define Ctrl_LNibWrite 0x08/* LP_PSELECP */
drivers/net/wireless/ath/ath6kl/hif.h +1 -1
@@ -183,7 +183,7 @@ struct hif_scatter_req {/* bounce buffer for upper layers to copy to/from */ u8 *virt_dma_buf; -struct hif_scatter_item scat_list[1 ]; +struct hif_scatter_item scat_list[0 ]; };struct ath6kl_hif_ops {
drivers/net/wireless/ath/ath6kl/sdio.c +2 -2
@@ -319,7 +319,7 @@ static int ath6kl_sdio_alloc_prep_scat_req(struct ath6kl_sdio *ar_sdio,int i, scat_req_sz, scat_list_sz, sg_sz, buf_sz;u8 *virt_buf; - scat_list_sz = (n_scat_entry -1 ) *sizeof (struct hif_scatter_item ); + scat_list_sz = n_scat_entry *sizeof (struct hif_scatter_item ); scat_req_sz =sizeof (*s_req) + scat_list_sz;if (!virt_scat)
@@ -670,7 +670,7 @@ static int ath6kl_sdio_enable_scatter(struct ath6kl *ar) {struct ath6kl_sdio *ar_sdio =ath6kl_sdio_priv (ar);struct htc_target *target = ar->htc_target; -int ret; +int ret =0 ;bool virt_scat = false;/* check if host supports scatter and it meets our requirements */
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +1 -1
@@ -2465,7 +2465,7 @@ static s32 brcmf_init_iscan(struct brcmf_cfg80211_priv *cfg_priv)return err; } -static void brcmf_delay (u32 ms) +static __always_inline void brcmf_delay(u32 ms) {if (ms <1000 /HZ ) {cond_resched ();
drivers/net/wireless/brcm80211/brcmsmac/aiutils.c +0 -3
@@ -1193,9 +1193,6 @@ void ai_detach(struct si_pub *sih) {struct si_info *sii; -struct si_pub *si_local =NULL ; -memcpy (&si_local, &sih,sizeof (struct si_pub **)); - sii = (struct si_info *)sih;if (sii ==NULL )
drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c +3 -2
@@ -672,7 +672,8 @@ static void rtl92c_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hwu8 thermalvalue, delta, delta_lck, delta_iqk;long ele_a, ele_d, temp_cck, val_x, value32;long val_y, ele_c =0 ; -u8 ofdm_index[2 ], cck_index =0 , ofdm_index_old[2 ], cck_index_old =0 ; +u8 ofdm_index[2 ], ofdm_index_old[2 ] = {0 ,0 }, cck_index_old =0 ; +s8 cck_index =0 ;int i;bool is2t =IS_92C_SERIAL (rtlhal->version);s8 txpwr_level[2 ] = {0 ,0 };
@@ -721,7 +722,7 @@ static void rtl92c_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hwfor (i =0 ; i <OFDM_TABLE_LENGTH ; i++) {if (ele_d == (ofdmswing_table[i] &MASKOFDM_D )) { - + ofdm_index_old[1 ] = (u8 ) i;
Lines of this file are not shown. View the raw message.
drivers/net/wireless/rtlwifi/rtl8192de/dm.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/net/wireless/rtlwifi/rtl8192se/phy.c +3 -0
Lines of this file are not shown. View the raw message.
include/linux/nospec.h new file +59 -0
59 lines not on this page · raw message
kernel/gcov/gcc_3_4.c +115 -0
115 lines not on this page · raw message
kernel/gcov/gcc_4_7.c new file +565 -0
565 lines not on this page · raw message
kernel/gcov/gcov.h +11 -54
65 lines not on this page · raw message
scripts/mod/modpost.c +47 -11
58 lines not on this page · raw message
security/selinux/ss/services.c +32 -22
54 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.