Commit 5aaaa537 authored Jul 31, 2018 by Greg Kroah-Hartman

Merge 4.14.57 into android-4.14



Changes in 4.14.57
	compiler-gcc.h: Add __attribute__((gnu_inline)) to all inline declarations
	x86/asm: Add _ASM_ARG* constants for argument registers to <asm/asm.h>
	x86/paravirt: Make native_save_fl() extern inline
	Btrfs: fix duplicate extents after fsync of file with prealloc extents
	cpufreq / CPPC: Set platform specific transition_delay_us
	xprtrdma: Fix corner cases when handling device removal
	ocfs2: subsystem.su_mutex is required while accessing the item->ci_parent
	ocfs2: ip_alloc_sem should be taken in ocfs2_get_block()
	bcm63xx_enet: correct clock usage
	bcm63xx_enet: do not write to random DMA channel on BCM6345
	PCI: exynos: Fix a potential init_clk_resources NULL pointer dereference
	crypto: crypto4xx - remove bad list_del
	crypto: crypto4xx - fix crypto4xx_build_pdr, crypto4xx_build_sdr leak
	alx: take rtnl before calling __alx_open from resume
	atm: Preserve value of skb->truesize when accounting to vcc
	atm: zatm: Fix potential Spectre v1
	hv_netvsc: split sub-channel setup into async and sync
	ipv6: sr: fix passing wrong flags to crypto_alloc_shash()
	ipvlan: fix IFLA_MTU ignored on NEWLINK
	ixgbe: split XDP_TX tail and XDP_REDIRECT map flushing
	net: dccp: avoid crash in ccid3_hc_rx_send_feedback()
	net: dccp: switch rx_tstamp_last_feedback to monotonic clock
	net: fix use-after-free in GRO with ESP
	net: macb: Fix ptp time adjustment for large negative delta
	net/mlx5e: Avoid dealing with vport representors if not being e-switch manager
	net/mlx5e: Don't attempt to dereference the ppriv struct if not being eswitch manager
	net/mlx5: E-Switch, Avoid setup attempt if not being e-switch manager
	net/mlx5: Fix command interface race in polling mode
	net/mlx5: Fix incorrect raw command length parsing
	net/mlx5: Fix required capability for manipulating MPFS
	net/mlx5: Fix wrong size allocation for QoS ETC TC regitster
	net: mvneta: fix the Rx desc DMA address in the Rx path
	net/packet: fix use-after-free
	net_sched: blackhole: tell upper qdisc about dropped packets
	net: sungem: fix rx checksum support
	net/tcp: Fix socket lookups with SO_BINDTODEVICE
	qede: Adverstise software timestamp caps when PHC is not available.
	qed: Fix setting of incorrect eswitch mode.
	qed: Fix use of incorrect size in memcpy call.
	qed: Limit msix vectors in kdump kernel to the minimum required count.
	qmi_wwan: add support for the Dell Wireless 5821e module
	r8152: napi hangup fix after disconnect
	stmmac: fix DMA channel hang in half-duplex mode
	strparser: Remove early eaten to fix full tcp receive buffer stall
	tcp: fix Fast Open key endianness
	tcp: prevent bogus FRTO undos with non-SACK flows
	vhost_net: validate sock before trying to put its fd
	VSOCK: fix loopback on big-endian systems
	net: cxgb3_main: fix potential Spectre v1
	rtlwifi: Fix kernel Oops "Fw download fail!!"
	rtlwifi: rtl8821ae: fix firmware is not ready to run
	net: lan78xx: Fix race in tx pending skb size calculation
	xhci: Fix USB3 NULL pointer dereference at logical disconnect.
	media: rc: oops in ir_timer_keyup after device unplug
	clocksource: Initialize cs->wd_list
	crypto: af_alg - Initialize sg_num_bytes in error code path
	mtd: rawnand: denali_dt: set clk_x_rate to 200 MHz unconditionally
	block: do not use interruptible wait anywhere
	PCI: hv: Disable/enable IRQs rather than BH in hv_compose_msi_msg()
	netfilter: ebtables: reject non-bridge targets
	reiserfs: fix buffer overflow with long warning messages
	KEYS: DNS: fix parsing multiple options
	tls: Stricter error checking in zerocopy sendmsg path
	autofs: fix slab out of bounds read in getname_kernel()
	nsh: set mac len based on inner packet
	netfilter: ipv6: nf_defrag: drop skb dst before queueing
	bdi: Fix another oops in wb_workfn()
	rds: avoid unenecessary cong_update in loop transport
	net/nfc: Avoid stalls when nfc_alloc_send_skb() returned NULL.
	KVM: arm64: Store vcpu on the stack during __guest_enter()
	KVM: arm/arm64: Convert kvm_host_cpu_state to a static per-cpu allocation
	KVM: arm64: Change hyp_panic()s dependency on tpidr_el2
	arm64: alternatives: use tpidr_el2 on VHE hosts
	KVM: arm64: Stop save/restoring host tpidr_el1 on VHE
	arm64: alternatives: Add dynamic patching feature
	KVM: arm/arm64: Do not use kern_hyp_va() with kvm_vgic_global_state
	KVM: arm64: Avoid storing the vcpu pointer on the stack
	arm/arm64: smccc: Add SMCCC-specific return codes
	arm64: Call ARCH_WORKAROUND_2 on transitions between EL0 and EL1
	arm64: Add per-cpu infrastructure to call ARCH_WORKAROUND_2
	arm64: Add ARCH_WORKAROUND_2 probing
	arm64: Add 'ssbd' command-line option
	arm64: ssbd: Add global mitigation state accessor
	arm64: ssbd: Skip apply_ssbd if not using dynamic mitigation
	arm64: ssbd: Restore mitigation status on CPU resume
	arm64: ssbd: Introduce thread flag to control userspace mitigation
	arm64: ssbd: Add prctl interface for per-thread mitigation
	arm64: KVM: Add HYP per-cpu accessors
	arm64: KVM: Add ARCH_WORKAROUND_2 support for guests
	arm64: KVM: Handle guest's ARCH_WORKAROUND_2 requests
	arm64: KVM: Add ARCH_WORKAROUND_2 discovery through ARCH_FEATURES_FUNC_ID
	string: drop __must_check from strscpy() and restore strscpy() usages in cgroup
	Linux 4.14.57

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

parents 73421a43 ecc160ec

Documentation/admin-guide/kernel-parameters.txt

+17 −0

Original line number	Original line	Diff line number	Diff line
	@@ -4000,6 +4000,23 @@
	expediting. Set to zero to disable automatic		expediting. Set to zero to disable automatic
	expediting.		expediting.

			ssbd= [ARM64,HW]
			Speculative Store Bypass Disable control

			On CPUs that are vulnerable to the Speculative
			Store Bypass vulnerability and offer a
			firmware based mitigation, this parameter
			indicates how the mitigation should be used:

			force-on: Unconditionally enable mitigation for
			for both kernel and userspace
			force-off: Unconditionally disable mitigation for
			for both kernel and userspace
			kernel: Always enable mitigation in the
			kernel, and offer a prctl interface
			to allow userspace to register its
			interest in being mitigated too.

	stack_guard_gap= [MM]		stack_guard_gap= [MM]
	override the default stack gap protection. The value		override the default stack gap protection. The value
	is in page units and it defines how many pages prior		is in page units and it defines how many pages prior

Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	# SPDX-License-Identifier: GPL-2.0		# SPDX-License-Identifier: GPL-2.0
	VERSION = 4		VERSION = 4
	PATCHLEVEL = 14		PATCHLEVEL = 14
	SUBLEVEL = 56		SUBLEVEL = 57
	EXTRAVERSION =		EXTRAVERSION =
	NAME = Petit Gorille		NAME = Petit Gorille

arch/arm/include/asm/kvm_host.h

+12 −0

Original line number	Original line	Diff line number	Diff line
	@@ -302,4 +302,16 @@ static inline bool kvm_arm_harden_branch_predictor(void)
	return false;		return false;
	}		}

			#define KVM_SSBD_UNKNOWN -1
			#define KVM_SSBD_FORCE_DISABLE 0
			#define KVM_SSBD_KERNEL 1
			#define KVM_SSBD_FORCE_ENABLE 2
			#define KVM_SSBD_MITIGATED 3

			static inline int kvm_arm_have_ssbd(void)
			{
			/* No way to detect it yet, pretend it is not there. */
			return KVM_SSBD_UNKNOWN;
			}

	#endif /* __ARM_KVM_HOST_H__ */		#endif /* __ARM_KVM_HOST_H__ */

arch/arm/include/asm/kvm_mmu.h

+12 −0

Original line number	Original line	Diff line number	Diff line
	@@ -28,6 +28,13 @@
	*/		*/
	#define kern_hyp_va(kva) (kva)		#define kern_hyp_va(kva) (kva)

			/* Contrary to arm64, there is no need to generate a PC-relative address */
			#define hyp_symbol_addr(s) \
			({ \
			typeof(s) *addr = &(s); \
			addr; \
			})

	/*		/*
	* KVM_MMU_CACHE_MIN_PAGES is the number of stage2 page table translation levels.		* KVM_MMU_CACHE_MIN_PAGES is the number of stage2 page table translation levels.
	*/		*/
	@@ -247,6 +254,11 @@ static inline int kvm_map_vectors(void)
	return 0;		return 0;
	}		}

			static inline int hyp_map_aux_data(void)
			{
			return 0;
			}

	#endif /* !__ASSEMBLY__ */		#endif /* !__ASSEMBLY__ */

	#endif /* __ARM_KVM_MMU_H__ */		#endif /* __ARM_KVM_MMU_H__ */

arch/arm64/Kconfig

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -850,6 +850,15 @@ config HARDEN_BRANCH_PREDICTOR

	If unsure, say Y.		If unsure, say Y.

			config ARM64_SSBD
			bool "Speculative Store Bypass Disable" if EXPERT
			default y
			help
			This enables mitigation of the bypassing of previous stores
			by speculative loads.

			If unsure, say Y.

	menuconfig ARMV8_DEPRECATED		menuconfig ARMV8_DEPRECATED
	bool "Emulate deprecated/obsolete ARMv8 instructions"		bool "Emulate deprecated/obsolete ARMv8 instructions"
	depends on COMPAT		depends on COMPAT