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

Commit 7fb3f18d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.19.194 into android-4.19-stable 



Changes in 4.19.194
	net: usb: cdc_ncm: don't spew notifications
	ALSA: usb: update old-style static const declaration
	nl80211: validate key indexes for cfg80211_registered_device
	efi: Allow EFI_MEMORY_XP and EFI_MEMORY_RO both to be cleared
	efi: cper: fix snprintf() use in cper_dimm_err_location()
	vfio/pci: Fix error return code in vfio_ecap_init()
	vfio/pci: zap_vma_ptes() needs MMU
	samples: vfio-mdev: fix error handing in mdpy_fb_probe()
	vfio/platform: fix module_put call in error flow
	ipvs: ignore IP_VS_SVC_F_HASHED flag when adding service
	HID: pidff: fix error return code in hid_pidff_init()
	HID: i2c-hid: fix format string mismatch
	netfilter: nfnetlink_cthelper: hit EBUSY on updates if size mismatches
	ieee802154: fix error return code in ieee802154_add_iface()
	ieee802154: fix error return code in ieee802154_llsec_getparams()
	ixgbevf: add correct exception tracing for XDP
	tipc: add extack messages for bearer/media failure
	tipc: fix unique bearer names sanity check
	Bluetooth: fix the erroneous flush_work() order
	Bluetooth: use correct lock to prevent UAF of hdev object
	net: caif: added cfserl_release function
	net: caif: add proper error handling
	net: caif: fix memory leak in caif_device_notify
	net: caif: fix memory leak in cfusbl_device_notify
	HID: multitouch: require Finger field to mark Win8 reports as MT
	ALSA: timer: Fix master timer notification
	ALSA: hda: Fix for mute key LED for HP Pavilion 15-CK0xx
	ext4: fix bug on in ext4_es_cache_extent as ext4_split_extent_at failed
	usb: dwc2: Fix build in periphal-only mode
	pid: take a reference when initializing `cad_pid`
	ocfs2: fix data corruption by fallocate
	nfc: fix NULL ptr dereference in llcp_sock_getname() after failed connect
	x86/apic: Mark _all_ legacy interrupts when IO/APIC is missing
	btrfs: mark ordered extent and inode with error if we fail to finish
	btrfs: fix error handling in btrfs_del_csums
	btrfs: return errors from btrfs_del_csums in cleanup_ref_head
	btrfs: fixup error handling in fixup_inode_link_counts
	mm, hugetlb: fix simple resv_huge_pages underflow on UFFDIO_COPY
	bpf: fix test suite to enable all unpriv program types
	bpf: test make sure to run unpriv test cases in test_verifier
	selftests/bpf: Generalize dummy program types
	bpf: Add BPF_F_ANY_ALIGNMENT.
	bpf: Adjust F_NEEDS_EFFICIENT_UNALIGNED_ACCESS handling in test_verifier.c
	bpf: Make more use of 'any' alignment in test_verifier.c
	bpf: Apply F_NEEDS_EFFICIENT_UNALIGNED_ACCESS to more ACCEPT test cases.
	selftests/bpf: add "any alignment" annotation for some tests
	selftests/bpf: Avoid running unprivileged tests with alignment requirements
	bnxt_en: Remove the setting of dev_port.
	perf/cgroups: Don't rotate events for cgroups unnecessarily
	perf/core: Fix corner case in perf_rotate_context()
	btrfs: fix unmountable seed device after fstrim
	KVM: SVM: Truncate GPR value for DR and CR accesses in !64-bit mode
	KVM: arm64: Fix debug register indexing
	ACPI: probe ECDT before loading AML tables regardless of module-level code flag
	ACPI: EC: Look for ECDT EC after calling acpi_load_tables()
	sched/fair: Optimize select_idle_cpu
	xen-pciback: redo VF placement in the virtual topology
	Linux 4.19.194

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I87188f5f931bdb7987f2946859f899a42e29f4b1
parents ea6ea821 9a2dc0e6

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 193

SUBLEVEL = 194

EXTRAVERSION =

NAME = "People's Front"

arch/arm64/kvm/sys_regs.c

+21 −21
Original line number Diff line number Diff line
@@ -426,14 +426,14 @@ static bool trap_bvr(struct kvm_vcpu *vcpu, 
		     struct sys_reg_params *p,

		     const struct sys_reg_desc *rd)

{

	u64 *dbg_reg = &vcpu->arch.vcpu_debug_state.dbg_bvr[rd->reg];

	u64 *dbg_reg = &vcpu->arch.vcpu_debug_state.dbg_bvr[rd->CRm];



	if (p->is_write)

		reg_to_dbg(vcpu, p, dbg_reg);

	else

		dbg_to_reg(vcpu, p, dbg_reg);



	trace_trap_reg(__func__, rd->reg, p->is_write, *dbg_reg);

	trace_trap_reg(__func__, rd->CRm, p->is_write, *dbg_reg);



	return true;

}
@@ -441,7 +441,7 @@ static bool trap_bvr(struct kvm_vcpu *vcpu, 
static int set_bvr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd,

		const struct kvm_one_reg *reg, void __user *uaddr)

{

	__u64 *r = &vcpu->arch.vcpu_debug_state.dbg_bvr[rd->reg];

	__u64 *r = &vcpu->arch.vcpu_debug_state.dbg_bvr[rd->CRm];



	if (copy_from_user(r, uaddr, KVM_REG_SIZE(reg->id)) != 0)

		return -EFAULT;
@@ -451,7 +451,7 @@ static int set_bvr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd, 
static int get_bvr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd,

	const struct kvm_one_reg *reg, void __user *uaddr)

{

	__u64 *r = &vcpu->arch.vcpu_debug_state.dbg_bvr[rd->reg];

	__u64 *r = &vcpu->arch.vcpu_debug_state.dbg_bvr[rd->CRm];



	if (copy_to_user(uaddr, r, KVM_REG_SIZE(reg->id)) != 0)

		return -EFAULT;
@@ -461,21 +461,21 @@ static int get_bvr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd, 
static void reset_bvr(struct kvm_vcpu *vcpu,

		      const struct sys_reg_desc *rd)

{

	vcpu->arch.vcpu_debug_state.dbg_bvr[rd->reg] = rd->val;

	vcpu->arch.vcpu_debug_state.dbg_bvr[rd->CRm] = rd->val;

}



static bool trap_bcr(struct kvm_vcpu *vcpu,

		     struct sys_reg_params *p,

		     const struct sys_reg_desc *rd)

{

	u64 *dbg_reg = &vcpu->arch.vcpu_debug_state.dbg_bcr[rd->reg];

	u64 *dbg_reg = &vcpu->arch.vcpu_debug_state.dbg_bcr[rd->CRm];



	if (p->is_write)

		reg_to_dbg(vcpu, p, dbg_reg);

	else

		dbg_to_reg(vcpu, p, dbg_reg);



	trace_trap_reg(__func__, rd->reg, p->is_write, *dbg_reg);

	trace_trap_reg(__func__, rd->CRm, p->is_write, *dbg_reg);



	return true;

}
@@ -483,7 +483,7 @@ static bool trap_bcr(struct kvm_vcpu *vcpu, 
static int set_bcr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd,

		const struct kvm_one_reg *reg, void __user *uaddr)

{

	__u64 *r = &vcpu->arch.vcpu_debug_state.dbg_bcr[rd->reg];

	__u64 *r = &vcpu->arch.vcpu_debug_state.dbg_bcr[rd->CRm];



	if (copy_from_user(r, uaddr, KVM_REG_SIZE(reg->id)) != 0)

		return -EFAULT;
@@ -494,7 +494,7 @@ static int set_bcr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd, 
static int get_bcr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd,

	const struct kvm_one_reg *reg, void __user *uaddr)

{

	__u64 *r = &vcpu->arch.vcpu_debug_state.dbg_bcr[rd->reg];

	__u64 *r = &vcpu->arch.vcpu_debug_state.dbg_bcr[rd->CRm];



	if (copy_to_user(uaddr, r, KVM_REG_SIZE(reg->id)) != 0)

		return -EFAULT;
@@ -504,22 +504,22 @@ static int get_bcr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd, 
static void reset_bcr(struct kvm_vcpu *vcpu,

		      const struct sys_reg_desc *rd)

{

	vcpu->arch.vcpu_debug_state.dbg_bcr[rd->reg] = rd->val;

	vcpu->arch.vcpu_debug_state.dbg_bcr[rd->CRm] = rd->val;

}



static bool trap_wvr(struct kvm_vcpu *vcpu,

		     struct sys_reg_params *p,

		     const struct sys_reg_desc *rd)

{

	u64 *dbg_reg = &vcpu->arch.vcpu_debug_state.dbg_wvr[rd->reg];

	u64 *dbg_reg = &vcpu->arch.vcpu_debug_state.dbg_wvr[rd->CRm];



	if (p->is_write)

		reg_to_dbg(vcpu, p, dbg_reg);

	else

		dbg_to_reg(vcpu, p, dbg_reg);



	trace_trap_reg(__func__, rd->reg, p->is_write,

		vcpu->arch.vcpu_debug_state.dbg_wvr[rd->reg]);

	trace_trap_reg(__func__, rd->CRm, p->is_write,

		vcpu->arch.vcpu_debug_state.dbg_wvr[rd->CRm]);



	return true;

}
@@ -527,7 +527,7 @@ static bool trap_wvr(struct kvm_vcpu *vcpu, 
static int set_wvr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd,

		const struct kvm_one_reg *reg, void __user *uaddr)

{

	__u64 *r = &vcpu->arch.vcpu_debug_state.dbg_wvr[rd->reg];

	__u64 *r = &vcpu->arch.vcpu_debug_state.dbg_wvr[rd->CRm];



	if (copy_from_user(r, uaddr, KVM_REG_SIZE(reg->id)) != 0)

		return -EFAULT;
@@ -537,7 +537,7 @@ static int set_wvr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd, 
static int get_wvr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd,

	const struct kvm_one_reg *reg, void __user *uaddr)

{

	__u64 *r = &vcpu->arch.vcpu_debug_state.dbg_wvr[rd->reg];

	__u64 *r = &vcpu->arch.vcpu_debug_state.dbg_wvr[rd->CRm];



	if (copy_to_user(uaddr, r, KVM_REG_SIZE(reg->id)) != 0)

		return -EFAULT;
@@ -547,21 +547,21 @@ static int get_wvr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd, 
static void reset_wvr(struct kvm_vcpu *vcpu,

		      const struct sys_reg_desc *rd)

{

	vcpu->arch.vcpu_debug_state.dbg_wvr[rd->reg] = rd->val;

	vcpu->arch.vcpu_debug_state.dbg_wvr[rd->CRm] = rd->val;

}



static bool trap_wcr(struct kvm_vcpu *vcpu,

		     struct sys_reg_params *p,

		     const struct sys_reg_desc *rd)

{

	u64 *dbg_reg = &vcpu->arch.vcpu_debug_state.dbg_wcr[rd->reg];

	u64 *dbg_reg = &vcpu->arch.vcpu_debug_state.dbg_wcr[rd->CRm];



	if (p->is_write)

		reg_to_dbg(vcpu, p, dbg_reg);

	else

		dbg_to_reg(vcpu, p, dbg_reg);



	trace_trap_reg(__func__, rd->reg, p->is_write, *dbg_reg);

	trace_trap_reg(__func__, rd->CRm, p->is_write, *dbg_reg);



	return true;

}
@@ -569,7 +569,7 @@ static bool trap_wcr(struct kvm_vcpu *vcpu, 
static int set_wcr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd,

		const struct kvm_one_reg *reg, void __user *uaddr)

{

	__u64 *r = &vcpu->arch.vcpu_debug_state.dbg_wcr[rd->reg];

	__u64 *r = &vcpu->arch.vcpu_debug_state.dbg_wcr[rd->CRm];



	if (copy_from_user(r, uaddr, KVM_REG_SIZE(reg->id)) != 0)

		return -EFAULT;
@@ -579,7 +579,7 @@ static int set_wcr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd, 
static int get_wcr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd,

	const struct kvm_one_reg *reg, void __user *uaddr)

{

	__u64 *r = &vcpu->arch.vcpu_debug_state.dbg_wcr[rd->reg];

	__u64 *r = &vcpu->arch.vcpu_debug_state.dbg_wcr[rd->CRm];



	if (copy_to_user(uaddr, r, KVM_REG_SIZE(reg->id)) != 0)

		return -EFAULT;
@@ -589,7 +589,7 @@ static int get_wcr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd, 
static void reset_wcr(struct kvm_vcpu *vcpu,

		      const struct sys_reg_desc *rd)

{

	vcpu->arch.vcpu_debug_state.dbg_wcr[rd->reg] = rd->val;

	vcpu->arch.vcpu_debug_state.dbg_wcr[rd->CRm] = rd->val;

}



static void reset_amair_el1(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r)

arch/x86/include/asm/apic.h

+1 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ static inline int apic_is_clustered_box(void) 
extern int setup_APIC_eilvt(u8 lvt_off, u8 vector, u8 msg_type, u8 mask);

extern void lapic_assign_system_vectors(void);

extern void lapic_assign_legacy_vector(unsigned int isairq, bool replace);

extern void lapic_update_legacy_vectors(void);

extern void lapic_online(void);

extern void lapic_offline(void);

arch/x86/kernel/apic/apic.c

+1 −0
Original line number Diff line number Diff line
@@ -2507,6 +2507,7 @@ void __init apic_bsp_setup(bool upmode) 
	end_local_APIC_setup();

	irq_remap_enable_fault_handling();

	setup_IO_APIC();

	lapic_update_legacy_vectors();

}



#ifdef CONFIG_UP_LATE_INIT

arch/x86/kernel/apic/vector.c

+20 −0
Original line number Diff line number Diff line
@@ -682,6 +682,26 @@ void lapic_assign_legacy_vector(unsigned int irq, bool replace) 
	irq_matrix_assign_system(vector_matrix, ISA_IRQ_VECTOR(irq), replace);

}



void __init lapic_update_legacy_vectors(void)

{

	unsigned int i;



	if (IS_ENABLED(CONFIG_X86_IO_APIC) && nr_ioapics > 0)

		return;



	/*

	 * If the IO/APIC is disabled via config, kernel command line or

	 * lack of enumeration then all legacy interrupts are routed

	 * through the PIC. Make sure that they are marked as legacy

	 * vectors. PIC_CASCADE_IRQ has already been marked in

	 * lapic_assign_system_vectors().

	 */

	for (i = 0; i < nr_legacy_irqs(); i++) {

		if (i != PIC_CASCADE_IR)

			lapic_assign_legacy_vector(i, true);

	}

}



void __init lapic_assign_system_vectors(void)

{

	unsigned int i, vector = 0;