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

Commit 64f28a85 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.19.72 into android-4.19-q 



Changes in 4.19.72
	mld: fix memory leak in mld_del_delrec()
	net: fix skb use after free in netpoll
	net: sched: act_sample: fix psample group handling on overwrite
	net_sched: fix a NULL pointer deref in ipt action
	net: stmmac: dwmac-rk: Don't fail if phy regulator is absent
	tcp: inherit timestamp on mtu probe
	tcp: remove empty skb from write queue in error cases
	net/rds: Fix info leak in rds6_inc_info_copy()
	x86/boot: Preserve boot_params.secure_boot from sanitizing
	spi: bcm2835aux: unifying code between polling and interrupt driven code
	spi: bcm2835aux: remove dangerous uncontrolled read of fifo
	spi: bcm2835aux: fix corruptions for longer spi transfers
	net: tundra: tsi108: use spin_lock_irqsave instead of spin_lock_irq in IRQ context
	netfilter: nf_tables: use-after-free in failing rule with bound set
	tools: bpftool: fix error message (prog -> object)
	hv_netvsc: Fix a warning of suspicious RCU usage
	net: tc35815: Explicitly check NET_IP_ALIGN is not zero in tc35815_rx
	Bluetooth: btqca: Add a short delay before downloading the NVM
	ibmveth: Convert multicast list size for little-endian system
	gpio: Fix build error of function redefinition
	netfilter: nft_flow_offload: skip tcp rst and fin packets
	drm/mediatek: use correct device to import PRIME buffers
	drm/mediatek: set DMA max segment size
	scsi: qla2xxx: Fix gnl.l memory leak on adapter init failure
	scsi: target: tcmu: avoid use-after-free after command timeout
	cxgb4: fix a memory leak bug
	liquidio: add cleanup in octeon_setup_iq()
	net: myri10ge: fix memory leaks
	lan78xx: Fix memory leaks
	vfs: fix page locking deadlocks when deduping files
	cx82310_eth: fix a memory leak bug
	net: kalmia: fix memory leaks
	ibmvnic: Unmap DMA address of TX descriptor buffers after use
	net: cavium: fix driver name
	wimax/i2400m: fix a memory leak bug
	ravb: Fix use-after-free ravb_tstamp_skb
	kprobes: Fix potential deadlock in kprobe_optimizer()
	HID: cp2112: prevent sleeping function called from invalid context
	x86/boot/compressed/64: Fix boot on machines with broken E820 table
	Input: hyperv-keyboard: Use in-place iterator API in the channel callback
	Tools: hv: kvp: eliminate 'may be used uninitialized' warning
	nvme-multipath: fix possible I/O hang when paths are updated
	IB/mlx4: Fix memory leaks
	infiniband: hfi1: fix a memory leak bug
	infiniband: hfi1: fix memory leaks
	selftests: kvm: fix state save/load on processors without XSAVE
	selftests/kvm: make platform_info_test pass on AMD
	ceph: fix buffer free while holding i_ceph_lock in __ceph_setxattr()
	ceph: fix buffer free while holding i_ceph_lock in __ceph_build_xattrs_blob()
	ceph: fix buffer free while holding i_ceph_lock in fill_inode()
	KVM: arm/arm64: Only skip MMIO insn once
	afs: Fix leak in afs_lookup_cell_rcu()
	KVM: arm/arm64: VGIC: Properly initialise private IRQ affinity
	x86/boot/compressed/64: Fix missing initialization in find_trampoline_placement()
	libceph: allow ceph_buffer_put() to receive a NULL ceph_buffer
	Revert "x86/apic: Include the LDR when clearing out APIC registers"
	Linux 4.19.72

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I9c77f23ff47856e50448608a70410d502d3c2f1a
parents 3716d346 ee809c7e

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 71

SUBLEVEL = 72

EXTRAVERSION =

NAME = "People's Front"

arch/x86/boot/compressed/pgtable_64.c

+10 −3
Original line number Diff line number Diff line
@@ -73,6 +73,8 @@ static unsigned long find_trampoline_placement(void) 


	/* Find the first usable memory region under bios_start. */

	for (i = boot_params->e820_entries - 1; i >= 0; i--) {

		unsigned long new = bios_start;



		entry = &boot_params->e820_table[i];



		/* Skip all entries above bios_start. */
@@ -85,15 +87,20 @@ static unsigned long find_trampoline_placement(void) 


		/* Adjust bios_start to the end of the entry if needed. */

		if (bios_start > entry->addr + entry->size)

			bios_start = entry->addr + entry->size;

			new = entry->addr + entry->size;



		/* Keep bios_start page-aligned. */

		bios_start = round_down(bios_start, PAGE_SIZE);

		new = round_down(new, PAGE_SIZE);



		/* Skip the entry if it's too small. */

		if (bios_start - TRAMPOLINE_32BIT_SIZE < entry->addr)

		if (new - TRAMPOLINE_32BIT_SIZE < entry->addr)

			continue;



		/* Protect against underflow. */

		if (new - TRAMPOLINE_32BIT_SIZE > bios_start)

			break;



		bios_start = new;

		break;

	}

arch/x86/include/asm/bootparam_utils.h

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ static void sanitize_boot_params(struct boot_params *boot_params) 
			BOOT_PARAM_PRESERVE(eddbuf_entries),

			BOOT_PARAM_PRESERVE(edd_mbr_sig_buf_entries),

			BOOT_PARAM_PRESERVE(edd_mbr_sig_buffer),

			BOOT_PARAM_PRESERVE(secure_boot),

			BOOT_PARAM_PRESERVE(hdr),

			BOOT_PARAM_PRESERVE(e820_table),

			BOOT_PARAM_PRESERVE(eddbuf),

arch/x86/kernel/apic/apic.c

+0 −4
Original line number Diff line number Diff line
@@ -1140,10 +1140,6 @@ void clear_local_APIC(void) 
	apic_write(APIC_LVT0, v | APIC_LVT_MASKED);

	v = apic_read(APIC_LVT1);

	apic_write(APIC_LVT1, v | APIC_LVT_MASKED);

	if (!x2apic_enabled()) {

		v = apic_read(APIC_LDR) & ~APIC_LDR_MASK;

		apic_write(APIC_LDR, v);

	}

	if (maxlvt >= 4) {

		v = apic_read(APIC_LVTPC);

		apic_write(APIC_LVTPC, v | APIC_LVT_MASKED);

drivers/bluetooth/btqca.c

+3 −0
Original line number Diff line number Diff line
@@ -363,6 +363,9 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, 
		return err;

	}



	/* Give the controller some time to get ready to receive the NVM */

	msleep(10);



	/* Download NVM configuration */

	config.type = TLV_TYPE_NVM;

	if (soc_type == QCA_WCN3990)