Linux 4.9.95
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 9 -SUBLEVEL = 94 +SUBLEVEL = 95 EXTRAVERSION = NAME = Roaring Lionus
arch/arm/include/asm/kvm_host.h +6 -0
@@ -318,4 +318,10 @@ static inline int kvm_arm_vcpu_arch_has_attr(struct kvm_vcpu *vcpu, return -ENXIO; } +static inline bool kvm_arm_harden_branch_predictor (void ) +{ +/* No way to detect it yet, pretend it is not there. */ +return false; +} +#endif /* __ARM_KVM_HOST_H__ */
arch/arm/include/asm/kvm_mmu.h +10 -0
@@ -223,6 +223,16 @@ static inline unsigned int kvm_get_vmid_bits(void)return 8 ; } +static inline void *kvm_get_hyp_vector (void ) +{ +return kvm_ksym_ref (__kvm_hyp_vector); +} + +static inline int kvm_map_vectors (void ) +{ +return 0 ; +} +#endif /* !__ASSEMBLY__ */ #endif /* __ARM_KVM_MMU_H__ */
arch/arm/include/asm/kvm_psci.h deleted +0 -27
@@ -1,27 +0,0 @@ -/* -* Copyright (C) 2012 - ARM Ltd -* Author: Marc Zyngier <[email protected]> -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#ifndef __ARM_KVM_PSCI_H__ -#define __ARM_KVM_PSCI_H__ - -#define KVM_ARM_PSCI_0_1 1 -#define KVM_ARM_PSCI_0_2 2 - -int kvm_psci_version (struct kvm_vcpu *vcpu); -int kvm_psci_call (struct kvm_vcpu *vcpu); - -#endif /* __ARM_KVM_PSCI_H__ */
arch/arm/kvm/arm.c +9 -2
@@ -29,6 +29,7 @@#include <linux/kvm.h> #include <trace/events/kvm.h> #include <kvm/arm_pmu.h> +#include <kvm/arm_psci.h> #define CREATE_TRACE_POINTS #include "trace.h"
@@ -44,7 +45,6 @@#include <asm/kvm_mmu.h> #include <asm/kvm_emulate.h> #include <asm/kvm_coproc.h> -#include <asm/kvm_psci.h> #include <asm/sections.h> #ifdef REQUIRES_VIRT
@@ -1088,7 +1088,7 @@ static void cpu_init_hyp_mode(void *dummy) pgd_ptr =kvm_mmu_get_httbr (); stack_page =__this_cpu_read (kvm_arm_hyp_stack_page); hyp_stack_ptr = stack_page +PAGE_SIZE ; - vector_ptr = (unsigned long )kvm_ksym_ref (__kvm_hyp_vector); + vector_ptr = (unsigned long )kvm_get_hyp_vector ();__cpu_init_hyp_mode (pgd_ptr, hyp_stack_ptr, vector_ptr);__cpu_init_stage2 ();
@@ -1345,6 +1345,13 @@ static int init_hyp_mode(void) goto out_err; } + + err =kvm_map_vectors (); +if (err) { +kvm_err ("Cannot map vectors\n" ); + goto out_err; + } +/* * Map the Hyp stack pages */
arch/arm/kvm/handle_exit.c +2 -2
@@ -21,7 +21,7 @@#include <asm/kvm_emulate.h> #include <asm/kvm_coproc.h> #include <asm/kvm_mmu.h> -#include <asm/kvm_psci.h> +#include <kvm/arm_psci.h> #include <trace/events/kvm.h> #include "trace.h"
@@ -36,7 +36,7 @@ static int handle_hvc(struct kvm_vcpu *vcpu, struct kvm_run *run) kvm_vcpu_hvc_get_imm(vcpu)); vcpu->stat.hvc_exit_stat++; - ret =kvm_psci_call (vcpu); + ret =kvm_hvc_call_handler (vcpu);if (ret <0 ) {vcpu_set_reg (vcpu,0 , ~0UL );return 1 ;
arch/arm/kvm/psci.c +119 -24
235 lines not on this page · raw message
arch/arm64/Kconfig +17 -0
@@ -745,6 +745,23 @@ config UNMAP_KERNEL_AT_EL0 If unsure, say Y. +config HARDEN_BRANCH_PREDICTOR + bool "Harden the branch predictor against aliasing attacks" if EXPERT + default y + help + Speculation attacks against some high-performance processors rely on + being able to manipulate the branch predictor for a victim context by + executing aliasing branches in the attacker context. Such attacks + can be partially mitigated against by clearing internal branch + predictor state and limiting the prediction logic in some situations. + + This config option will take CPU-specific actions to harden the + branch predictor against aliasing attacks and may rely on specific + instruction sequences or control bits being set by the system + firmware. + + If unsure, say Y. + menuconfig ARMV8_DEPRECATED bool "Emulate deprecated/obsolete ARMv8 instructions" depends on COMPAT
arch/arm64/crypto/sha256-core.S new file +2061 -0
2,061 lines not on this page · raw message
arch/arm64/crypto/sha512-core.S new file +1085 -0
570 lines not on this page · raw message
arch/arm64/include/asm/kvm_psci.h deleted +0 -27
Lines of this file are not shown. View the raw message.
arch/arm64/include/asm/uaccess.h +100 -53
153 lines not on this page · raw message
arch/arm64/kernel/bpi.S new file +75 -0
75 lines not on this page · raw message
arch/arm64/kernel/cpu_errata.c +186 -3
189 lines not on this page · raw message
drivers/firmware/psci.c +52 -5
57 lines not on this page · raw message
drivers/media/v4l2-core/v4l2-compat-ioctl32.c +3 -1
Lines of this file are not shown. View the raw message.
drivers/net/phy/micrel.c +14 -28
42 lines not on this page · raw message
drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/s390/cio/qdio_main.c +22 -20
42 lines not on this page · raw message
include/kvm/arm_psci.h new file +51 -0
51 lines not on this page · raw message
include/linux/arm-smccc.h +163 -2
165 lines not on this page · raw message
tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +31 -33
64 lines not on this page · raw message
tools/perf/util/intel-pt-decoder/intel-pt-decoder.h +1 -1
Lines of this file are not shown. View the 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.
Greg KH
maintainerI'm announcing the release of the 4.9.95 kernel.
All users of the 4.9 kernel series must upgrade.
The updated 4.9.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.9.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/arm/include/asm/kvm_host.h | 6 arch/arm/include/asm/kvm_mmu.h | 10 arch/arm/include/asm/kvm_psci.h | 27 arch/arm/kvm/arm.c | 11 arch/arm/kvm/handle_exit.c | 4 arch/arm/kvm/psci.c | 143 + arch/arm64/Kconfig | 17 arch/arm64/crypto/sha256-core.S | 2061 ++++++++++++++++++++ arch/arm64/crypto/sha512-core.S | 1085 ++++++++++ arch/arm64/include/asm/assembler.h | 19 arch/arm64/include/asm/barrier.h | 23 arch/arm64/include/asm/cpucaps.h | 3 arch/arm64/include/asm/cputype.h | 6 arch/arm64/include/asm/futex.h | 9 arch/arm64/include/asm/kvm_host.h | 5 arch/arm64/include/asm/kvm_mmu.h | 38 arch/arm64/include/asm/kvm_psci.h | 27 arch/arm64/include/asm/memory.h | 15 arch/arm64/include/asm/mmu.h | 39 arch/arm64/include/asm/processor.h | 24 arch/arm64/include/asm/sysreg.h | 2 arch/arm64/include/asm/uaccess.h | 153 - arch/arm64/kernel/Makefile | 4 arch/arm64/kernel/arm64ksyms.c | 4 arch/arm64/kernel/bpi.S | 75 arch/arm64/kernel/cpu_errata.c | 189 + arch/arm64/kernel/cpufeature.c | 10 arch/arm64/kernel/entry.S | 25 arch/arm64/kvm/handle_exit.c | 16 arch/arm64/kvm/hyp/hyp-entry.S | 20 arch/arm64/kvm/hyp/switch.c | 5 arch/arm64/lib/clear_user.S | 6 arch/arm64/lib/copy_in_user.S | 4 arch/arm64/mm/context.c | 12 arch/arm64/mm/fault.c | 34 arch/arm64/mm/proc.S | 7 arch/parisc/kernel/drivers.c | 4 arch/s390/kernel/ipl.c | 1 drivers/acpi/nfit/core.c | 22 drivers/block/loop.c | 12 drivers/firmware/psci.c | 57 drivers/gpu/drm/radeon/radeon_object.c | 3 drivers/hv/channel_mgmt.c | 2 drivers/hwmon/ina2xx.c | 3 drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 4 drivers/net/phy/micrel.c | 42 drivers/net/slip/slhc.c | 5 drivers/net/usb/cdc_ether.c | 6 drivers/net/usb/lan78xx.c | 3 drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c | 2 drivers/s390/cio/qdio_main.c | 42 drivers/vhost/vhost.c | 8 fs/namei.c | 3 include/kvm/arm_psci.h | 51 include/linux/arm-smccc.h | 165 + include/linux/mm.h | 4 include/linux/psci.h | 14 include/net/bluetooth/hci_core.h | 2 include/net/slhc_vj.h | 1 include/uapi/linux/psci.h | 3 kernel/events/core.c | 6 net/bluetooth/hci_conn.c | 29 net/bluetooth/hci_event.c | 15 net/bluetooth/l2cap_core.c | 2 net/rds/send.c | 15 net/sunrpc/auth_gss/gss_krb5_crypto.c | 3 tools/perf/tests/code-reading.c | 20 tools/perf/util/intel-pt-decoder/intel-pt-decoder.c | 64 tools/perf/util/intel-pt-decoder/intel-pt-decoder.h | 2 tools/perf/util/intel-pt.c | 37 71 files changed, 4442 insertions(+), 350 deletions(-)
Adrian Hunter (4):
perf intel-pt: Fix overlap detection to identify consecutive buffers correctly perf intel-pt: Fix sync_switch
perf intel-pt: Fix error recovery from missing TIP packet
perf intel-pt: Fix timestamp following overflow
Al Viro (1):
getname_kernel() needs to make sure that ->name != ->iname in long case
Arnd Bergmann (1):
radeon: hide pointless #warning when compile testing
Bassem Boubaker (1):
cdc_ether: flag the Cinterion AHS8 modem by gemalto as WWAN
Dan Williams (1):
nfit: fix region registration vs block-data-window ranges
Dexuan Cui (1):
Drivers: hv: vmbus: do not mark HV_PCIE as perf_device
Eric Biggers (1):
sunrpc: remove incorrect HMAC request initialization
Greg Kroah-Hartman (3):
Revert "perf tests: Decompress kernel module before objdump" Revert "net: phy: micrel: Restore led_mode and clk_sel on resume" Linux 4.9.95
Helge Deller (1):
parisc: Fix out of array access in match_pci_device()
Julian Wiedmann (2):
s390/qdio: don't retry EQBS after CCQ 96
s390/qdio: don't merge ERROR output buffers
Ka-Cheong Poon (1):
rds: MP-RDS may use an invalid c_path
Marek Szyprowski (1):
hwmon: (ina2xx) Fix access to uninitialized mutex
Mark Rutland (41):
arm64: barrier: Add CSDB macros to control data-value prediction
arm64: Implement array_index_mask_nospec()
arm64: move TASK_* definitions to <asm/processor.h>
arm64: Make USER_DS an inclusive limit
arm64: Use pointer masking to limit uaccess speculation
arm64: entry: Ensure branch through syscall table is bounded under speculation
arm64: uaccess: Prevent speculative use of the current addr_limit
arm64: uaccess: Don't bother eliding access_ok checks in __{get, put}_user
arm64: uaccess: Mask __user pointers for __arch_{clear, copy_*}_user
arm64: cpufeature: __this_cpu_has_cap() shouldn't stop early
arm64: Run enable method for errata work arounds on late CPUs
arm64: cpufeature: Pass capability structure to ->enable callback drivers/firmware: Expose psci_get_version through psci_ops structure
arm64: Factor out TTBR0_EL1 post-update workaround into a specific asm macro
arm64: Move post_ttbr_update_workaround to C code
arm64: Add skeleton to harden the branch predictor against aliasing attacks
arm64: Move BP hardening to check_and_switch_context
mm: Introduce lm_alias
arm64: KVM: Use per-CPU vector when BP hardening is enabled
arm64: entry: Apply BP hardening for high-priority synchronous exceptions
arm64: entry: Apply BP hardening for suspicious interrupts from EL0
arm64: cputype: Add missing MIDR values for Cortex-A72 and Cortex-A75
arm64: cpu_errata: Allow an erratum to be match for all revisions of a core
arm64: Implement branch predictor hardening for affected Cortex-A CPUs
arm64: Branch predictor hardening for Cavium ThunderX2
arm64: KVM: Increment PC after handling an SMC trap
arm/arm64: KVM: Consolidate the PSCI include files
arm/arm64: KVM: Add PSCI_VERSION helper
arm/arm64: KVM: Add smccc accessors to PSCI code
arm/arm64: KVM: Implement PSCI 1.0 support
arm/arm64: KVM: Advertise SMCCC v1.1
arm64: KVM: Make PSCI_VERSION a fast path
arm/arm64: KVM: Turn kvm_psci_version into a static inline
arm64: KVM: Report SMCCC_ARCH_WORKAROUND_1 BP hardening support
arm64: KVM: Add SMCCC_ARCH_WORKAROUND_1 fast handling firmware/psci: Expose PSCI conduit
firmware/psci: Expose SMCCC version through psci_ops
arm/arm64: smccc: Make function identifiers an unsigned quantity arm/arm64: smccc: Implement SMCCC v1.1 inline primitive
arm64: Add ARM_SMCCC_ARCH_WORKAROUND_1 BP hardening support
arm64: Kill PSCI_GET_VERSION as a variant-2 workaround
Mauro Carvalho Chehab (1):
media: v4l2-compat-ioctl32: don't oops on overlay
Phil Elwell (1):
lan78xx: Correctly indicate invalid OTP
Prashant Bhole (1):
perf/core: Fix use-after-free in uprobe_perf_close()
Stefan Hajnoczi (1):
vhost: fix vhost_vq_access_ok() log check
Sudhir Sreedharan (1):
rtl8187: Fix NULL pointer dereference in priv->conf_mutex
Szymon Janc (1):
Bluetooth: Fix connection if directed advertising and privacy is used
Tejaswi Tanikella (1):
slip: Check if rstate is initialized before uncompressing
Tetsuo Handa (1):
block/loop: fix deadlock after loop_set_status
Vasily Gorbik (1):
s390/ipl: ensure loadparm valid flag is set
Will Deacon (1):
arm64: futex: Mask __user pointers prior to dereference