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

Commit 8ca2f023 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.19.167 into android-4.19-stable 



Changes in 4.19.167
	kbuild: don't hardcode depmod path
	workqueue: Kick a worker based on the actual activation of delayed works
	scsi: ufs: Fix wrong print message in dev_err()
	scsi: ufs-pci: Ensure UFS device is in PowerDown mode for suspend-to-disk ->poweroff()
	scsi: ide: Do not set the RQF_PREEMPT flag for sense requests
	scsi: scsi_transport_spi: Set RQF_PM for domain validation commands
	lib/genalloc: fix the overflow when size is too big
	depmod: handle the case of /sbin/depmod without /sbin in PATH
	proc: change ->nlink under proc_subdir_lock
	proc: fix lookup in /proc/net subdirectories after setns(2)
	i40e: Fix Error I40E_AQ_RC_EINVAL when removing VFs
	net: mvpp2: Add TCAM entry to drop flow control pause frames
	net: mvpp2: prs: fix PPPoE with ipv6 packet parse
	ethernet: ucc_geth: fix use-after-free in ucc_geth_remove()
	ethernet: ucc_geth: set dev->max_mtu to 1518
	atm: idt77252: call pci_disable_device() on error path
	net: mvpp2: Fix GoP port 3 Networking Complex Control configurations
	qede: fix offload for IPIP tunnel packets
	virtio_net: Fix recursive call to cpus_read_lock()
	net/ncsi: Use real net-device for response handler
	net: ethernet: Fix memleak in ethoc_probe
	net-sysfs: take the rtnl lock when storing xps_cpus
	net-sysfs: take the rtnl lock when accessing xps_cpus_map and num_tc
	net: ethernet: ti: cpts: fix ethtool output when no ptp_clock registered
	tun: fix return value when the number of iovs exceeds MAX_SKB_FRAGS
	ipv4: Ignore ECN bits for fib lookups in fib_compute_spec_dst()
	net: hns: fix return value check in __lb_other_process()
	erspan: fix version 1 check in gre_parse_header()
	net: hdlc_ppp: Fix issues when mod_timer is called while timer is running
	CDC-NCM: remove "connected" log message
	net: usb: qmi_wwan: add Quectel EM160R-GL
	r8169: work around power-saving bug on some chip versions
	vhost_net: fix ubuf refcount incorrectly when sendmsg fails
	net: sched: prevent invalid Scell_log shift count
	net-sysfs: take the rtnl lock when storing xps_rxqs
	net-sysfs: take the rtnl lock when accessing xps_rxqs_map and num_tc
	net: systemport: set dev->max_mtu to UMAC_MAX_MTU_SIZE
	Bluetooth: revert: hci_h5: close serdev device and free hu in h5_close
	video: hyperv_fb: Fix the mmap() regression for v5.4.y and older
	crypto: ecdh - avoid buffer overflow in ecdh_set_secret()
	staging: mt7621-dma: Fix a resource leak in an error handling path
	usb: gadget: enable super speed plus
	USB: cdc-acm: blacklist another IR Droid device
	USB: cdc-wdm: Fix use after free in service_outstanding_interrupt().
	usb: dwc3: ulpi: Use VStsDone to detect PHY regs access completion
	usb: chipidea: ci_hdrc_imx: add missing put_device() call in usbmisc_get_init_data()
	USB: xhci: fix U1/U2 handling for hardware with XHCI_INTEL_HOST quirk set
	usb: usbip: vhci_hcd: protect shift size
	usb: uas: Add PNY USB Portable SSD to unusual_uas
	USB: serial: iuu_phoenix: fix DMA from stack
	USB: serial: option: add LongSung M5710 module support
	USB: serial: option: add Quectel EM160R-GL
	USB: yurex: fix control-URB timeout handling
	USB: usblp: fix DMA to stack
	ALSA: usb-audio: Fix UBSAN warnings for MIDI jacks
	usb: gadget: select CONFIG_CRC32
	usb: gadget: f_uac2: reset wMaxPacketSize
	usb: gadget: function: printer: Fix a memory leak for interface descriptor
	usb: gadget: u_ether: Fix MTU size mismatch with RX packet size
	USB: gadget: legacy: fix return error code in acm_ms_bind()
	usb: gadget: Fix spinlock lockup on usb_function_deactivate
	usb: gadget: configfs: Preserve function ordering after bind failure
	usb: gadget: configfs: Fix use-after-free issue with udc_name
	USB: serial: keyspan_pda: remove unused variable
	x86/mm: Fix leak of pmd ptlock
	ALSA: hda/via: Fix runtime PM for Clevo W35xSS
	ALSA: hda/conexant: add a new hda codec CX11970
	ALSA: hda/realtek - Fix speaker volume control on Lenovo C940
	btrfs: send: fix wrong file path when there is an inode with a pending rmdir
	Revert "device property: Keep secondary firmware node secondary by type"
	xen/pvh: correctly setup the PV EFI interface for dom0
	netfilter: x_tables: Update remaining dereference to RCU
	netfilter: ipset: fix shift-out-of-bounds in htable_bits()
	netfilter: xt_RATEEST: reject non-null terminated string from userspace
	x86/mtrr: Correct the range check before performing MTRR type lookups
	KVM: x86: fix shift out of bounds reported by UBSAN
	scsi: target: Fix XCOPY NAA identifier lookup
	Linux 4.19.167

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Id204bcc705c98d3344f33de84431cc7ca0868246
parents d6a5783e 675cc038

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 166

SUBLEVEL = 167

EXTRAVERSION =

NAME = "People's Front"
@@ -400,7 +400,7 @@ YACC = bison 
AWK		= awk

GENKSYMS	= scripts/genksyms/genksyms

INSTALLKERNEL  := installkernel

DEPMOD		= /sbin/depmod

DEPMOD		= depmod

PERL		= perl

PYTHON		= python

PYTHON2		= python2

arch/x86/kernel/cpu/mtrr/generic.c

+3 −3
Original line number Diff line number Diff line
@@ -166,9 +166,6 @@ static u8 mtrr_type_lookup_variable(u64 start, u64 end, u64 *partial_end, 
	*repeat = 0;

	*uniform = 1;



	/* Make end inclusive instead of exclusive */

	end--;



	prev_match = MTRR_TYPE_INVALID;

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

		unsigned short start_state, end_state, inclusive;
@@ -260,6 +257,9 @@ u8 mtrr_type_lookup(u64 start, u64 end, u8 *uniform) 
	int repeat;

	u64 partial_end;



	/* Make end inclusive instead of exclusive */

	end--;



	if (!mtrr_state_set)

		return MTRR_TYPE_INVALID;

arch/x86/kvm/mmu.h

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ static inline u64 rsvd_bits(int s, int e) 
	if (e < s)

		return 0;



	return ((1ULL << (e - s + 1)) - 1) << s;

	return ((2ULL << (e - s)) - 1) << s;

}



void kvm_mmu_set_mmio_spte_mask(u64 mmio_mask, u64 mmio_value);

arch/x86/mm/pgtable.c

+2 −0
Original line number Diff line number Diff line
@@ -838,6 +838,8 @@ int pud_free_pmd_page(pud_t *pud, unsigned long addr) 
	}



	free_page((unsigned long)pmd_sv);



	pgtable_pmd_page_dtor(virt_to_page(pmd));

	free_page((unsigned long)pmd);



	return 1;

arch/x86/xen/efi.c

+6 −6
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ static enum efi_secureboot_mode xen_efi_get_secureboot(void) 
	return efi_secureboot_mode_unknown;

}



void __init xen_efi_init(void)

void __init xen_efi_init(struct boot_params *boot_params)

{

	efi_system_table_t *efi_systab_xen;
@@ -181,12 +181,12 @@ void __init xen_efi_init(void) 
	if (efi_systab_xen == NULL)

		return;



	strncpy((char *)&boot_params.efi_info.efi_loader_signature, "Xen",

			sizeof(boot_params.efi_info.efi_loader_signature));

	boot_params.efi_info.efi_systab = (__u32)__pa(efi_systab_xen);

	boot_params.efi_info.efi_systab_hi = (__u32)(__pa(efi_systab_xen) >> 32);

	strncpy((char *)&boot_params->efi_info.efi_loader_signature, "Xen",

			sizeof(boot_params->efi_info.efi_loader_signature));

	boot_params->efi_info.efi_systab = (__u32)__pa(efi_systab_xen);

	boot_params->efi_info.efi_systab_hi = (__u32)(__pa(efi_systab_xen) >> 32);



	boot_params.secure_boot = xen_efi_get_secureboot();

	boot_params->secure_boot = xen_efi_get_secureboot();



	set_bit(EFI_BOOT, &efi.flags);

	set_bit(EFI_PARAVIRT, &efi.flags);