Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b856698 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.19.281 into android-4.19-stable 



Changes in 4.19.281
	pinctrl: Added IRQF_SHARED flag for amd-pinctrl driver
	pinctrl: amd: Use irqchip template
	pinctrl: amd: disable and mask interrupts on probe
	pinctrl: amd: Disable and mask interrupts on resume
	NFSv4: Convert struct nfs4_state to use refcount_t
	NFSv4: Check the return value of update_open_stateid()
	NFSv4: Fix hangs when recovering open state after a server reboot
	pwm: cros-ec: Explicitly set .polarity in .get_state()
	wifi: mac80211: fix invalid drv_sta_pre_rcu_remove calls for non-uploaded sta
	icmp: guard against too small mtu
	net: don't let netpoll invoke NAPI if in xmit context
	sctp: check send stream number after wait_for_sndbuf
	ipv6: Fix an uninit variable access bug in __ip6_make_skb()
	gpio: davinci: Add irq chip flag to skip set wake
	USB: serial: cp210x: add Silicon Labs IFS-USB-DATACABLE IDs
	USB: serial: option: add Telit FE990 compositions
	USB: serial: option: add Quectel RM500U-CN modem
	iio: dac: cio-dac: Fix max DAC write value check for 12-bit
	tty: serial: sh-sci: Fix transmit end interrupt handler
	tty: serial: sh-sci: Fix Rx on RZ/G2L SCI
	nilfs2: fix potential UAF of struct nilfs_sc_info in nilfs_segctor_thread()
	nilfs2: fix sysfs interface lifetime
	ALSA: hda/realtek: Add quirk for Clevo X370SNW
	perf/core: Fix the same task check in perf_event_set_output
	ftrace: Mark get_lock_parent_ip() __always_inline
	ring-buffer: Fix race while reader and writer are on the same page
	mm/swap: fix swap_info_struct race between swapoff and get_swap_pages()
	Revert "pinctrl: amd: Disable and mask interrupts on resume"
	ALSA: emu10k1: fix capture interrupt handler unlinking
	ALSA: hda/sigmatel: add pin overrides for Intel DP45SG motherboard
	ALSA: i2c/cs8427: fix iec958 mixer control deactivation
	ALSA: hda/sigmatel: fix S/PDIF out on Intel D*45* motherboards
	Bluetooth: L2CAP: Fix use-after-free in l2cap_disconnect_{req,rsp}
	Bluetooth: Fix race condition in hidp_session_thread
	mtdblock: tolerate corrected bit-flips
	9p/xen : Fix use after free bug in xen_9pfs_front_remove due to race condition
	niu: Fix missing unwind goto in niu_alloc_channels()
	qlcnic: check pci_reset_function result
	sctp: fix a potential overflow in sctp_ifwdtsn_skip
	net: macb: fix a memory corruption in extended buffer descriptor mode
	udp6: fix potential access to stale information
	power: supply: cros_usbpd: reclassify "default case!" as debug
	i2c: imx-lpi2c: clean rx/tx buffers upon new message
	efi: sysfb_efi: Add quirk for Lenovo Yoga Book X91F/L
	verify_pefile: relax wrapper length check
	scsi: ses: Handle enclosure with just a primary component gracefully
	x86/PCI: Add quirk for AMD XHCI controller that loses MSI-X state in D3hot
	ubi: Fix failure attaching when vid_hdr offset equals to (sub)page size
	mtd: ubi: wl: Fix a couple of kernel-doc issues
	ubi: Fix deadlock caused by recursively holding work_sem
	cgroup/cpuset: Wake up cpuset_attach_wq tasks in cpuset_cancel_attach()
	watchdog: sbsa_wdog: Make sure the timeout programming is within the limits
	coresight-etm4: Fix for() loop drvdata->nr_addr_cmp range bug
	KVM: nVMX: add missing consistency checks for CR0 and CR4
	KVM: arm64: Factor out core register ID enumeration
	KVM: arm64: Filter out invalid core register IDs in KVM_GET_REG_LIST
	arm64: KVM: Fix system register enumeration
	Linux 4.19.281

Change-Id: I1883ac62812715a59cfcef066451a70fa7803b2e
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 9b68392a a5b79a58

Documentation/sound/hd-audio/models.rst

+1 −1
Original line number Diff line number Diff line
@@ -691,7 +691,7 @@ ref 
no-jd

    BIOS setup but without jack-detection

intel

    Intel DG45* mobos

    Intel D*45* mobos

dell-m6-amic

    Dell desktops/laptops with analog mics

dell-m6-dmic

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 280

SUBLEVEL = 281

EXTRAVERSION =

NAME = "People's Front"

arch/arm64/kvm/guest.c

+67 −16
Original line number Diff line number Diff line
@@ -57,9 +57,8 @@ static u64 core_reg_offset_from_id(u64 id) 
	return id & ~(KVM_REG_ARCH_MASK | KVM_REG_SIZE_MASK | KVM_REG_ARM_CORE);

}



static int validate_core_offset(const struct kvm_one_reg *reg)

static int core_reg_size_from_offset(u64 off)

{

	u64 off = core_reg_offset_from_id(reg->id);

	int size;



	switch (off) {
@@ -89,11 +88,24 @@ static int validate_core_offset(const struct kvm_one_reg *reg) 
		return -EINVAL;

	}



	if (KVM_REG_SIZE(reg->id) == size &&

	    IS_ALIGNED(off, size / sizeof(__u32)))

		return 0;

	if (!IS_ALIGNED(off, size / sizeof(__u32)))

		return -EINVAL;



	return size;

}



static int validate_core_offset(const struct kvm_one_reg *reg)

{

	u64 off = core_reg_offset_from_id(reg->id);

	int size = core_reg_size_from_offset(off);



	if (size < 0)

		return -EINVAL;



	if (KVM_REG_SIZE(reg->id) != size)

		return -EINVAL;



	return 0;

}



static int get_core_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg)
@@ -200,9 +212,51 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) 
	return -EINVAL;

}



static int kvm_arm_copy_core_reg_indices(u64 __user *uindices)

{

	unsigned int i;

	int n = 0;



	for (i = 0; i < sizeof(struct kvm_regs) / sizeof(__u32); i++) {

		u64 reg = KVM_REG_ARM64 | KVM_REG_ARM_CORE | i;

		int size = core_reg_size_from_offset(i);



		if (size < 0)

			continue;



		switch (size) {

		case sizeof(__u32):

			reg |= KVM_REG_SIZE_U32;

			break;



		case sizeof(__u64):

			reg |= KVM_REG_SIZE_U64;

			break;



		case sizeof(__uint128_t):

			reg |= KVM_REG_SIZE_U128;

			break;



		default:

			WARN_ON(1);

			continue;

		}



		if (uindices) {

			if (put_user(reg, uindices))

				return -EFAULT;

			uindices++;

		}



		n++;

	}



	return n;

}



static unsigned long num_core_regs(void)

{

	return sizeof(struct kvm_regs) / sizeof(__u32);

	return kvm_arm_copy_core_reg_indices(NULL);

}



/**
@@ -276,23 +330,20 @@ unsigned long kvm_arm_num_regs(struct kvm_vcpu *vcpu) 
 */

int kvm_arm_copy_reg_indices(struct kvm_vcpu *vcpu, u64 __user *uindices)

{

	unsigned int i;

	const u64 core_reg = KVM_REG_ARM64 | KVM_REG_SIZE_U64 | KVM_REG_ARM_CORE;

	int ret;



	for (i = 0; i < sizeof(struct kvm_regs) / sizeof(__u32); i++) {

		if (put_user(core_reg | i, uindices))

			return -EFAULT;

		uindices++;

	}

	ret = kvm_arm_copy_core_reg_indices(uindices);

	if (ret < 0)

		return ret;

	uindices += ret;



	ret = kvm_arm_copy_fw_reg_indices(vcpu, uindices);

	if (ret)

	if (ret < 0)

		return ret;

	uindices += kvm_arm_get_fw_num_regs(vcpu);



	ret = copy_timer_indices(vcpu, uindices);

	if (ret)

	if (ret < 0)

		return ret;

	uindices += NUM_TIMER_REGS;

arch/x86/kernel/sysfb_efi.c

+8 −0
Original line number Diff line number Diff line
@@ -273,6 +273,14 @@ static const struct dmi_system_id efifb_dmi_swap_width_height[] __initconst = { 
					"IdeaPad Duet 3 10IGL5"),

		},

	},

	{

		/* Lenovo Yoga Book X91F / X91L */

		.matches = {

			DMI_EXACT_MATCH(DMI_SYS_VENDOR, "LENOVO"),

			/* Non exact match to match F + L versions */

			DMI_MATCH(DMI_PRODUCT_NAME, "Lenovo YB1-X91"),

		},

	},

	{},

};

arch/x86/kvm/vmx/vmx.c

+8 −2
Original line number Diff line number Diff line
@@ -12752,7 +12752,7 @@ static int nested_vmx_check_vmcs_link_ptr(struct kvm_vcpu *vcpu, 
static int check_vmentry_postreqs(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12,

				  u32 *exit_qual)

{

	bool ia32e;

	bool ia32e = !!(vmcs12->vm_entry_controls & VM_ENTRY_IA32E_MODE);



	*exit_qual = ENTRY_FAIL_DEFAULT;
@@ -12765,6 +12765,13 @@ static int check_vmentry_postreqs(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12, 
		return 1;

	}



	if ((vmcs12->guest_cr0 & (X86_CR0_PG | X86_CR0_PE)) == X86_CR0_PG)

		return 1;



	if ((ia32e && !(vmcs12->guest_cr4 & X86_CR4_PAE)) ||

	    (ia32e && !(vmcs12->guest_cr0 & X86_CR0_PG)))

		return 1;



	/*

	 * If the load IA32_EFER VM-entry control is 1, the following checks

	 * are performed on the field for the IA32_EFER MSR:
@@ -12776,7 +12783,6 @@ static int check_vmentry_postreqs(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12, 
	 */

	if (to_vmx(vcpu)->nested.nested_run_pending &&

	    (vmcs12->vm_entry_controls & VM_ENTRY_LOAD_IA32_EFER)) {

		ia32e = (vmcs12->vm_entry_controls & VM_ENTRY_IA32E_MODE) != 0;

		if (!kvm_valid_efer(vcpu, vmcs12->guest_ia32_efer) ||

		    ia32e != !!(vmcs12->guest_ia32_efer & EFER_LMA) ||

		    ((vmcs12->guest_cr0 & X86_CR0_PG) &&