Commit 086155f9 authored Mar 23, 2022 by Greg Kroah-Hartman

Merge 4.19.236 into android-4.19-stable



Changes in 4.19.236
	Revert "xfrm: state and policy should fail if XFRMA_IF_ID 0"
	sctp: fix the processing for INIT chunk
	sctp: fix the processing for INIT_ACK chunk
	xfrm: Check if_id in xfrm_migrate
	xfrm: Fix xfrm migrate issues when address family changes
	arm64: dts: rockchip: fix rk3399-puma eMMC HS400 signal integrity
	arm64: dts: rockchip: reorder rk3399 hdmi clocks
	ARM: dts: rockchip: fix a typo on rk3288 crypto-controller
	MIPS: smp: fill in sibling and core maps earlier
	ARM: 9178/1: fix unmet dependency on BITREVERSE for HAVE_ARCH_BITREVERSE
	can: rcar_canfd: rcar_canfd_channel_probe(): register the CAN device when fully ready
	atm: firestream: check the return value of ioremap() in fs_init()
	nl80211: Update bss channel on channel switch for P2P_CLIENT
	tcp: make tcp_read_sock() more robust
	sfc: extend the locking on mcdi->seqno
	kselftest/vm: fix tests build with old libc
	sched/topology: Make sched_init_numa() use a set for the deduplicating sort
	sched/topology: Fix sched_domain_topology_level alloc in sched_init_numa()
	ia64: ensure proper NUMA distance and possible map initialization
	cpuset: Fix unsafe lock order between cpuset lock and cpuslock
	mm: fix dereference a null pointer in migrate[_huge]_page_move_mapping()
	fs: sysfs_emit: Remove PAGE_SIZE alignment check
	arm64: Add part number for Arm Cortex-A77
	arm64: Add Neoverse-N2, Cortex-A710 CPU part definition
	arm64: Add Cortex-X2 CPU part definition
	arm64: entry.S: Add ventry overflow sanity checks
	arm64: entry: Make the trampoline cleanup optional
	arm64: entry: Free up another register on kpti's tramp_exit path
	arm64: entry: Move the trampoline data page before the text page
	arm64: entry: Allow tramp_alias to access symbols after the 4K boundary
	arm64: entry: Don't assume tramp_vectors is the start of the vectors
	arm64: entry: Move trampoline macros out of ifdef'd section
	arm64: entry: Make the kpti trampoline's kpti sequence optional
	arm64: entry: Allow the trampoline text to occupy multiple pages
	arm64: entry: Add non-kpti __bp_harden_el1_vectors for mitigations
	arm64: entry: Add vectors that have the bhb mitigation sequences
	arm64: entry: Add macro for reading symbol addresses from the trampoline
	arm64: Add percpu vectors for EL1
	arm64: proton-pack: Report Spectre-BHB vulnerabilities as part of Spectre-v2
	KVM: arm64: Add templates for BHB mitigation sequences
	arm64: Mitigate spectre style branch history side channels
	KVM: arm64: Allow SMCCC_ARCH_WORKAROUND_3 to be discovered and migrated
	arm64: add ID_AA64ISAR2_EL1 sys register
	arm64: Use the clearbhb instruction in mitigations
	crypto: qcom-rng - ensure buffer for generate is completely filled
	ocfs2: fix crash when initialize filecheck kobj fails
	efi: fix return value of __setup handlers
	net/packet: fix slab-out-of-bounds access in packet_recvmsg()
	atm: eni: Add check for dma_map_single
	hv_netvsc: Add check for kvmalloc_array
	drm/panel: simple: Fix Innolux G070Y2-L01 BPP settings
	net: handle ARPHRD_PIMREG in dev_is_mac_header_xmit()
	net: dsa: Add missing of_node_put() in dsa_port_parse_of
	usb: gadget: rndis: prevent integer overflow in rndis_set_response()
	usb: gadget: Fix use-after-free bug by not setting udc->dev.driver
	Input: aiptek - properly check endpoint type
	perf symbols: Fix symbol size calculation condition
	Linux 4.19.236

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

parents b27aef49 67aefbfe

Makefile

+1 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		VERSION = 4
		PATCHLEVEL = 19
		SUBLEVEL = 235
		SUBLEVEL = 236
		EXTRAVERSION =
		NAME = "People's Front"

arch/arm/boot/dts/rk3288.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -957,7 +957,7 @@
		status = "disabled";
		};

		crypto: cypto-controller@ff8a0000 {
		crypto: crypto@ff8a0000 {
		compatible = "rockchip,rk3288-crypto";
		reg = <0x0 0xff8a0000 0x0 0x4000>;
		interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;

arch/arm/include/asm/kvm_host.h

+7 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@
		#include <asm/kvm_asm.h>
		#include <asm/kvm_mmio.h>
		#include <asm/fpstate.h>
		#include <asm/spectre.h>
		#include <kvm/arm_arch_timer.h>

		#define __KVM_HAVE_ARCH_INTC_INITIALIZED
		@@ -367,4 +368,10 @@ void kvm_arch_free_vm(struct kvm *kvm);

		#define kvm_arm_vcpu_loaded(vcpu) (false)

		static inline int kvm_arm_get_spectre_bhb_state(void)
		{
		/* 32bit guests don't need firmware for this */
		return SPECTRE_VULNERABLE; /* aka SMCCC_RET_NOT_SUPPORTED */
		}

		#endif /* __ARM_KVM_HOST_H__ */

arch/arm64/Kconfig

+9 −0

Original line number	Diff line number	Diff line
		@@ -1035,6 +1035,15 @@ config ARM64_SSBD

		If unsure, say Y.

		config MITIGATE_SPECTRE_BRANCH_HISTORY
		bool "Mitigate Spectre style attacks against branch history" if EXPERT
		default y
		help
		Speculation attacks against some high-performance processors can
		make use of branch history to influence future speculation.
		When taking an exception from user-space, a sequence of branches
		or a firmware call overwrites the branch history.

		config ARM64_TAGGED_ADDR_ABI
		bool "Enable the tagged user addresses syscall ABI"
		default y

arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi

+6 −0

Original line number	Diff line number	Diff line
		@@ -468,6 +468,12 @@
		};

		&sdhci {
		/*
		* Signal integrity isn't great at 200MHz but 100MHz has proven stable
		* enough.
		*/
		max-frequency = <100000000>;

		bus-width = <8>;
		mmc-hs400-1_8v;
		mmc-hs400-enhanced-strobe;