-----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAlvIM0wACgkQONu9yGCS aT5bkRAAqvQaEuy5Cm0BNrn5/f3SIo5H9NcEipxNX8/5KMG2FKT982VkxW5NFDBa AiHuzSUSAwufpBJai5TS0VhyjzkhYucoKsmgiIC+Or5rGZGWIkf6yw9LJXwEs3Jl xtuhCjs23CqlBjivPFMmFeDN74eIoPcLxjagLjjvSPEusYM8MNXedf87MUd1CNa3 E07k/8CpD8RiDgQBi8ehjL19TSD4OhhhdPzQqEx1nGLsyiBrv4KsfOSOslZPUw0m Wv5X5JJnyk0+nUhtq2KJwkgTqz54IMJzmGvaMPGLrZq2ArwT6ac3Ru3rMYZaDido TTy4f3mHb25upZHJ2QjCeuKxFpQMJfvkObj/rB4fOQSu/7MERiKK4jINWRL/g1h8 g5tKOf16uR7c3ItjXHnracoc3hKSEr4KguvoLit+CQAslcaXSnyxdKmRuEy9Akar 5nK6GsbxzHnT55ZsgxYMaCIfy4J9K2E61qoggJ+Dif8Cm97CGMkzb2mxygvKLXiV ROQ8DWyDvOqUerYBVu06aRfXNZWsBPzyZFsgKUYTKzYelY0AaiFe69D19NazfTGC XiFWhSgTlgzhBgtTJByrcGAUBelORfQP+nzB2rtZ3qfacGaJUskRpZn/Ii96a2Cb RBVyxs5oarmsdhSqn/0rTXsnOGsz3kIfQFl/AlbzmeRzhD+rbxE= =Z+mk -----END PGP SIGNATURE----- Merge 4.14.77 into android-4.14-p Changes in 4.14.77 bnxt_en: Fix TX timeout during netpoll. bnxt_en: free hwrm resources, if driver probe fails. bonding: avoid possible dead-lock ip6_tunnel: be careful when accessing the inner header ip_tunnel: be careful when accessing the inner header ipv4: fix use-after-free in ip_cmsg_recv_dstaddr() ipv6: take rcu lock in rawv6_send_hdrinc() net: dsa: bcm_sf2: Call setup during switch resume net: hns: fix for unmapping problem when SMMU is on net: ipv4: update fnhe_pmtu when first hop's MTU changes net/ipv6: Display all addresses in output of /proc/net/if_inet6 netlabel: check for IPV4MASK in addrinfo_get net: mvpp2: Extract the correct ethtype from the skb for tx csum offload net: mvpp2: fix a txq_done race condition net: sched: Add policy validation for tc attributes net: systemport: Fix wake-up interrupt race during resume net/usb: cancel pending work when unbinding smsc75xx qlcnic: fix Tx descriptor corruption on 82xx devices qmi_wwan: Added support for Gemalto's Cinterion ALASxx WWAN interface rtnetlink: fix rtnl_fdb_dump() for ndmsg header rtnl: limit IFLA_NUM_TX_QUEUES and IFLA_NUM_RX_QUEUES to 4096 sctp: update dst pmtu with the correct daddr team: Forbid enslaving team device to itself tipc: fix flow control accounting for implicit connect udp: Unbreak modules that rely on external __skb_recv_udp() availability net: stmmac: Fixup the tail addr setting in xmit path net/packet: fix packet drop as of virtio gso net: dsa: bcm_sf2: Fix unbind ordering net/mlx5e: Set vlan masks for all offloaded TC rules net: aquantia: memory corruption on jumbo frames net/mlx5: E-Switch, Fix out of bound access when setting vport rate bonding: pass link-local packets to bonding master also. bonding: fix warning message nfp: avoid soft lockups under control message storm bnxt_en: don't try to offload VLAN 'modify' action net-ethtool: ETHTOOL_GUFO did not and should not require CAP_NET_ADMIN tcp/dccp: fix lockdep issue when SYN is backlogged inet: make sure to grab rcu_read_lock before using ireq->ireq_opt ASoC: rt5514: Fix the issue of the delay volume applied again ASoC: wm8804: Add ACPI support ASoC: sigmadsp: safeload should not have lower byte limit selftests/efivarfs: add required kernel configs selftests: memory-hotplug: add required configs ASoC: rsnd: adg: care clock-frequency size ASoC: rsnd: don't fallback to PIO mode when -EPROBE_DEFER Bluetooth: hci_ldisc: Free rw_semaphore on close mfd: omap-usb-host: Fix dts probe of children scsi: iscsi: target: Don't use stack buffer for scatterlist scsi: qla2xxx: Fix an endian bug in fcpcmd_is_corrupted() sound: enable interrupt after dma buffer initialization sound: don't call skl_init_chip() to reset intel skl soc hv_netvsc: fix schedule in RCU context stmmac: fix valid numbers of unicast filter entries net: macb: disable scatter-gather for macb on sama5d3 ARM: dts: at91: add new compatibility string for macb on sama5d3 PCI: hv: support reporting serial number as slot information clk: x86: add "ether_clk" alias for Bay Trail / Cherry Trail clk: x86: Stop marking clocks as CLK_IS_CRITICAL x86/kvm/lapic: always disable MMIO interface in x2APIC mode drm/amdgpu: Fix SDMA HQD destroy error on gfx_v7 mm/vmstat.c: fix outdated vmstat_text MIPS: VDSO: Always map near top of user memory mach64: detect the dot clock divider correctly on sparc percpu: stop leaking bitmap metadata blocks perf script python: Fix export-to-postgresql.py occasional failure perf script python: Fix export-to-sqlite.py sample columns s390/cio: Fix how vfio-ccw checks pinned pages dm cache: destroy migration_cache if cache target registration failed dm: fix report zone remapping to account for partition offset dm linear: eliminate linear_end_io call if CONFIG_DM_ZONED disabled dm linear: fix linear_end_io conditional definition cgroup: Fix dom_cgrp propagation when enabling threaded mode mmc: block: avoid multiblock reads for the last sector in SPI mode pinctrl: mcp23s08: fix irq and irqchip setup order arm64: perf: Reject stand-alone CHAIN events for PMUv3 mm/thp: fix call to mmu_notifier in set_pmd_migration_entry() v2 mm: Preserve _PAGE_DEVMAP across mprotect() calls i2c: i2c-scmi: fix for i2c_smbus_write_block_data xhci: Don't print a warning when setting link state for disabled ports mm: introduce NR_INDIRECTLY_RECLAIMABLE_BYTES mm: treat indirectly reclaimable memory as available in MemAvailable dcache: account external names as indirectly reclaimable memory mm: treat indirectly reclaimable memory as free in overcommit logic mm: don't show nr_indirectly_reclaimable in /proc/vmstat ARM: add more CPU part numbers for Cortex and Brahma B15 CPUs ARM: bugs: prepare processor bug infrastructure ARM: bugs: hook processor bug checking into SMP and suspend paths ARM: bugs: add support for per-processor bug checking ARM: spectre: add Kconfig symbol for CPUs vulnerable to Spectre ARM: spectre-v2: harden branch predictor on context switches ARM: spectre-v2: add Cortex A8 and A15 validation of the IBE bit ARM: spectre-v2: harden user aborts in kernel space ARM: spectre-v2: add firmware based hardening ARM: spectre-v2: warn about incorrect context switching functions ARM: KVM: invalidate BTB on guest exit for Cortex-A12/A17 ARM: KVM: invalidate icache on guest exit for Cortex-A15 ARM: spectre-v2: KVM: invalidate icache on guest exit for Brahma B15 ARM: KVM: Add SMCCC_ARCH_WORKAROUND_1 fast handling ARM: KVM: report support for SMCCC_ARCH_WORKAROUND_1 ARM: spectre-v1: add speculation barrier (csdb) macros ARM: spectre-v1: add array_index_mask_nospec() implementation ARM: spectre-v1: fix syscall entry ARM: signal: copy registers using __copy_from_user() ARM: vfp: use __copy_from_user() when restoring VFP state ARM: oabi-compat: copy semops using __copy_from_user() ARM: use __inttype() in get_user() ARM: spectre-v1: use get_user() for __get_user() ARM: spectre-v1: mitigate user accesses perf tools: Fix snprint warnings for gcc 8 Linux 4.14.77 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>tirimbino
Greg Kroah-Hartman
6 years ago
commit
c2214bce1a
@ -0,0 +1,18 @@ |
||||
// SPDX-Identifier: GPL-2.0
|
||||
#include <linux/init.h> |
||||
#include <asm/bugs.h> |
||||
#include <asm/proc-fns.h> |
||||
|
||||
void check_other_bugs(void) |
||||
{ |
||||
#ifdef MULTI_CPU |
||||
if (processor.check_bugs) |
||||
processor.check_bugs(); |
||||
#endif |
||||
} |
||||
|
||||
void __init check_bugs(void) |
||||
{ |
||||
check_writebuffer_bugs(); |
||||
check_other_bugs(); |
||||
} |
||||
@ -0,0 +1,174 @@ |
||||
// SPDX-License-Identifier: GPL-2.0
|
||||
#include <linux/arm-smccc.h> |
||||
#include <linux/kernel.h> |
||||
#include <linux/psci.h> |
||||
#include <linux/smp.h> |
||||
|
||||
#include <asm/cp15.h> |
||||
#include <asm/cputype.h> |
||||
#include <asm/proc-fns.h> |
||||
#include <asm/system_misc.h> |
||||
|
||||
#ifdef CONFIG_HARDEN_BRANCH_PREDICTOR |
||||
DEFINE_PER_CPU(harden_branch_predictor_fn_t, harden_branch_predictor_fn); |
||||
|
||||
extern void cpu_v7_iciallu_switch_mm(phys_addr_t pgd_phys, struct mm_struct *mm); |
||||
extern void cpu_v7_bpiall_switch_mm(phys_addr_t pgd_phys, struct mm_struct *mm); |
||||
extern void cpu_v7_smc_switch_mm(phys_addr_t pgd_phys, struct mm_struct *mm); |
||||
extern void cpu_v7_hvc_switch_mm(phys_addr_t pgd_phys, struct mm_struct *mm); |
||||
|
||||
static void harden_branch_predictor_bpiall(void) |
||||
{ |
||||
write_sysreg(0, BPIALL); |
||||
} |
||||
|
||||
static void harden_branch_predictor_iciallu(void) |
||||
{ |
||||
write_sysreg(0, ICIALLU); |
||||
} |
||||
|
||||
static void __maybe_unused call_smc_arch_workaround_1(void) |
||||
{ |
||||
arm_smccc_1_1_smc(ARM_SMCCC_ARCH_WORKAROUND_1, NULL); |
||||
} |
||||
|
||||
static void __maybe_unused call_hvc_arch_workaround_1(void) |
||||
{ |
||||
arm_smccc_1_1_hvc(ARM_SMCCC_ARCH_WORKAROUND_1, NULL); |
||||
} |
||||
|
||||
static void cpu_v7_spectre_init(void) |
||||
{ |
||||
const char *spectre_v2_method = NULL; |
||||
int cpu = smp_processor_id(); |
||||
|
||||
if (per_cpu(harden_branch_predictor_fn, cpu)) |
||||
return; |
||||
|
||||
switch (read_cpuid_part()) { |
||||
case ARM_CPU_PART_CORTEX_A8: |
||||
case ARM_CPU_PART_CORTEX_A9: |
||||
case ARM_CPU_PART_CORTEX_A12: |
||||
case ARM_CPU_PART_CORTEX_A17: |
||||
case ARM_CPU_PART_CORTEX_A73: |
||||
case ARM_CPU_PART_CORTEX_A75: |
||||
if (processor.switch_mm != cpu_v7_bpiall_switch_mm) |
||||
goto bl_error; |
||||
per_cpu(harden_branch_predictor_fn, cpu) = |
||||
harden_branch_predictor_bpiall; |
||||
spectre_v2_method = "BPIALL"; |
||||
break; |
||||
|
||||
case ARM_CPU_PART_CORTEX_A15: |
||||
case ARM_CPU_PART_BRAHMA_B15: |
||||
if (processor.switch_mm != cpu_v7_iciallu_switch_mm) |
||||
goto bl_error; |
||||
per_cpu(harden_branch_predictor_fn, cpu) = |
||||
harden_branch_predictor_iciallu; |
||||
spectre_v2_method = "ICIALLU"; |
||||
break; |
||||
|
||||
#ifdef CONFIG_ARM_PSCI |
||||
default: |
||||
/* Other ARM CPUs require no workaround */ |
||||
if (read_cpuid_implementor() == ARM_CPU_IMP_ARM) |
||||
break; |
||||
/* fallthrough */ |
||||
/* Cortex A57/A72 require firmware workaround */ |
||||
case ARM_CPU_PART_CORTEX_A57: |
||||
case ARM_CPU_PART_CORTEX_A72: { |
||||
struct arm_smccc_res res; |
||||
|
||||
if (psci_ops.smccc_version == SMCCC_VERSION_1_0) |
||||
break; |
||||
|
||||
switch (psci_ops.conduit) { |
||||
case PSCI_CONDUIT_HVC: |
||||
arm_smccc_1_1_hvc(ARM_SMCCC_ARCH_FEATURES_FUNC_ID, |
||||
ARM_SMCCC_ARCH_WORKAROUND_1, &res); |
||||
if ((int)res.a0 != 0) |
||||
break; |
||||
if (processor.switch_mm != cpu_v7_hvc_switch_mm && cpu) |
||||
goto bl_error; |
||||
per_cpu(harden_branch_predictor_fn, cpu) = |
||||
call_hvc_arch_workaround_1; |
||||
processor.switch_mm = cpu_v7_hvc_switch_mm; |
||||
spectre_v2_method = "hypervisor"; |
||||
break; |
||||
|
||||
case PSCI_CONDUIT_SMC: |
||||
arm_smccc_1_1_smc(ARM_SMCCC_ARCH_FEATURES_FUNC_ID, |
||||
ARM_SMCCC_ARCH_WORKAROUND_1, &res); |
||||
if ((int)res.a0 != 0) |
||||
break; |
||||
if (processor.switch_mm != cpu_v7_smc_switch_mm && cpu) |
||||
goto bl_error; |
||||
per_cpu(harden_branch_predictor_fn, cpu) = |
||||
call_smc_arch_workaround_1; |
||||
processor.switch_mm = cpu_v7_smc_switch_mm; |
||||
spectre_v2_method = "firmware"; |
||||
break; |
||||
|
||||
default: |
||||
break; |
||||
} |
||||
} |
||||
#endif |
||||
} |
||||
|
||||
if (spectre_v2_method) |
||||
pr_info("CPU%u: Spectre v2: using %s workaround\n", |
||||
smp_processor_id(), spectre_v2_method); |
||||
return; |
||||
|
||||
bl_error: |
||||
pr_err("CPU%u: Spectre v2: incorrect context switching function, system vulnerable\n", |
||||
cpu); |
||||
} |
||||
#else |
||||
static void cpu_v7_spectre_init(void) |
||||
{ |
||||
} |
||||
#endif |
||||
|
||||
static __maybe_unused bool cpu_v7_check_auxcr_set(bool *warned, |
||||
u32 mask, const char *msg) |
||||
{ |
||||
u32 aux_cr; |
||||
|
||||
asm("mrc p15, 0, %0, c1, c0, 1" : "=r" (aux_cr)); |
||||
|
||||
if ((aux_cr & mask) != mask) { |
||||
if (!*warned) |
||||
pr_err("CPU%u: %s", smp_processor_id(), msg); |
||||
*warned = true; |
||||
return false; |
||||
} |
||||
return true; |
||||
} |
||||
|
||||
static DEFINE_PER_CPU(bool, spectre_warned); |
||||
|
||||
static bool check_spectre_auxcr(bool *warned, u32 bit) |
||||
{ |
||||
return IS_ENABLED(CONFIG_HARDEN_BRANCH_PREDICTOR) && |
||||
cpu_v7_check_auxcr_set(warned, bit, |
||||
"Spectre v2: firmware did not set auxiliary control register IBE bit, system vulnerable\n"); |
||||
} |
||||
|
||||
void cpu_v7_ca8_ibe(void) |
||||
{ |
||||
if (check_spectre_auxcr(this_cpu_ptr(&spectre_warned), BIT(6))) |
||||
cpu_v7_spectre_init(); |
||||
} |
||||
|
||||
void cpu_v7_ca15_ibe(void) |
||||
{ |
||||
if (check_spectre_auxcr(this_cpu_ptr(&spectre_warned), BIT(0))) |
||||
cpu_v7_spectre_init(); |
||||
} |
||||
|
||||
void cpu_v7_bugs_init(void) |
||||
{ |
||||
cpu_v7_spectre_init(); |
||||
} |
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue