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

Commit dd955093 authored by Ivaylo Georgiev's avatar Ivaylo Georgiev
Browse files

Merge android-4.19-q.72 (64f28a85) into msm-4.19 



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

Change-Id: Ia09fdffc6f30154c2bb5b7591d2d8a96c2c0648e
Signed-off-by: default avatarIvaylo Georgiev <irgeorgiev@codeaurora.org>
parents 37ad3421 64f28a85

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)