Commit cf77b7c4 authored May 03, 2020 by Greg Kroah-Hartman

Merge 4.9.221 into android-4.9-q



Changes in 4.9.221
	ext4: fix extent_status fragmentation for plain files
	net: ipv4: emulate READ_ONCE() on ->hdrincl bit-field in raw_sendmsg()
	net: ipv4: avoid unused variable warning for sysctl
	drm/msm: Use the correct dma_sync calls harder
	crypto: mxs-dcp - make symbols 'sha1_null_hash' and 'sha256_null_hash' static
	vti4: removed duplicate log message.
	watchdog: reset last_hw_keepalive time at start
	scsi: lpfc: Fix kasan slab-out-of-bounds error in lpfc_unreg_login
	ceph: return ceph_mdsc_do_request() errors from __get_parent()
	ceph: don't skip updating wanted caps when cap is stale
	pwm: rcar: Fix late Runtime PM enablement
	scsi: iscsi: Report unbind session event when the target has been removed
	ASoC: Intel: atom: Take the drv->lock mutex before calling sst_send_slot_map()
	kernel/gcov/fs.c: gcov_seq_next() should increase position index
	ipc/util.c: sysvipc_find_ipc() should increase position index
	s390/cio: avoid duplicated 'ADD' uevents
	pwm: renesas-tpu: Fix late Runtime PM enablement
	pwm: bcm2835: Dynamically allocate base
	PCI/ASPM: Allow re-enabling Clock PM
	ipv6: fix restrict IPV6_ADDRFORM operation
	macsec: avoid to set wrong mtu
	macvlan: fix null dereference in macvlan_device_event()
	net: netrom: Fix potential nr_neigh refcnt leak in nr_add_node
	net/x25: Fix x25_neigh refcnt leak when receiving frame
	tcp: cache line align MAX_TCP_HEADER
	team: fix hang in team_mode_get()
	net: dsa: b53: Fix ARL register definitions
	xfrm: Always set XFRM_TRANSFORMED in xfrm{4,6}_output_finish
	ALSA: hda: Remove ASUS ROG Zenith from the blacklist
	iio: xilinx-xadc: Fix ADC-B powerdown
	iio: xilinx-xadc: Fix clearing interrupt when enabling trigger
	iio: xilinx-xadc: Fix sequencer configuration for aux channels in simultaneous mode
	fs/namespace.c: fix mountpoint reference counter race
	USB: sisusbvga: Change port variable from signed to unsigned
	USB: Add USB_QUIRK_DELAY_CTRL_MSG and USB_QUIRK_DELAY_INIT for Corsair K70 RGB RAPIDFIRE
	USB: core: Fix free-while-in-use bug in the USB S-Glibrary
	USB: hub: Fix handling of connect changes during sleep
	overflow.h: Add arithmetic shift helper
	vmalloc: fix remap_vmalloc_range() bounds checks
	ALSA: usx2y: Fix potential NULL dereference
	ALSA: usb-audio: Fix usb audio refcnt leak when getting spdif
	ALSA: usb-audio: Filter out unsupported sample rates on Focusrite devices
	tpm/tpm_tis: Free IRQ if probing fails
	KVM: Check validity of resolved slot when searching memslots
	KVM: VMX: Enable machine check support for 32bit targets
	tty: hvc: fix buffer overflow during hvc_alloc().
	tty: rocket, avoid OOB access
	usb-storage: Add unusual_devs entry for JMicron JMS566
	audit: check the length of userspace generated audit records
	ASoC: dapm: fixup dapm kcontrol widget
	ARM: imx: provide v7_cpu_resume() only on ARM_CPU_SUSPEND=y
	staging: comedi: dt2815: fix writing hi byte of analog output
	staging: comedi: Fix comedi_device refcnt leak in comedi_open
	staging: vt6656: Fix drivers TBTT timing counter.
	staging: vt6656: Power save stop wake_up_count wrap around.
	UAS: no use logging any details in case of ENODEV
	UAS: fix deadlock in error handling and PM flushing work
	usb: f_fs: Clear OS Extended descriptor counts to zero in ffs_data_reset()
	remoteproc: Fix wrong rvring index computation
	fuse: fix possibly missed wake-up after abort
	mtd: cfi: fix deadloop in cfi_cmdset_0002.c do_write_buffer
	usb: gadget: udc: bdc: Remove unnecessary NULL checks in bdc_req_complete
	nfsd: memory corruption in nfsd4_lock()
	net/cxgb4: Check the return from t4_query_params properly
	perf/core: fix parent pid/tid in task exit events
	bpf, x86: Fix encoding for lower 8-bit registers in BPF_STX BPF_B
	xfs: fix partially uninitialized structure in xfs_reflink_remap_extent
	scsi: target: fix PR IN / READ FULL STATUS for FC
	objtool: Fix CONFIG_UBSAN_TRAP unreachable warnings
	objtool: Support Clang non-section symbols in ORC dump
	xen/xenbus: ensure xenbus_map_ring_valloc() returns proper grant status
	ext4: convert BUG_ON's to WARN_ON's in mballoc.c
	hwmon: (jc42) Fix name to have no illegal characters
	ext4: avoid declaring fs inconsistent due to invalid file handles
	ext4: protect journal inode's blocks using block_validity
	ext4: don't perform block validity checks on the journal inode
	ext4: fix block validity checks for journal inodes using indirect blocks
	ext4: unsigned int compared against zero
	ext4: check for non-zero journal inum in ext4_calculate_overhead
	propagate_one(): mnt_set_mountpoint() needs mount_lock
	Linux 4.9.221

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ica420bdbb6c18fff9d0e6abffc180beefff0c5b9

parents fccd884a 775dfa8c

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 9
		SUBLEVEL = 220
		SUBLEVEL = 221
		EXTRAVERSION =
		NAME = Roaring Lionus

arch/arm/mach-imx/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -86,8 +86,10 @@ AFLAGS_suspend-imx6.o :=-Wa,-march=armv7-a
		obj-$(CONFIG_SOC_IMX6) += suspend-imx6.o
		obj-$(CONFIG_SOC_IMX53) += suspend-imx53.o
		endif
		ifeq ($(CONFIG_ARM_CPU_SUSPEND),y)
		AFLAGS_resume-imx6.o :=-Wa,-march=armv7-a
		obj-$(CONFIG_SOC_IMX6) += resume-imx6.o
		endif
		obj-$(CONFIG_SOC_IMX6) += pm-imx6.o

		obj-$(CONFIG_SOC_IMX1) += mach-imx1.o

arch/x86/kvm/vmx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -5785,7 +5785,7 @@ static int handle_rmode_exception(struct kvm_vcpu *vcpu,
		*/
		static void kvm_machine_check(void)
		{
		#if defined(CONFIG_X86_MCE) && defined(CONFIG_X86_64)
		#if defined(CONFIG_X86_MCE)
		struct pt_regs regs = {
		.cs = 3, /* Fake ring 3 no matter what the guest ran on */
		.flags = X86_EFLAGS_IF,

arch/x86/net/bpf_jit_comp.c

+15 −3

Original line number	Diff line number	Diff line
		@@ -150,6 +150,19 @@ static bool is_ereg(u32 reg)
		BIT(BPF_REG_AX));
		}

		/*
		* is_ereg_8l() == true if BPF register 'reg' is mapped to access x86-64
		* lower 8-bit registers dil,sil,bpl,spl,r8b..r15b, which need extra byte
		* of encoding. al,cl,dl,bl have simpler encoding.
		*/
		static bool is_ereg_8l(u32 reg)
		{
		return is_ereg(reg) \|\|
		(1 << reg) & (BIT(BPF_REG_1) \|
		BIT(BPF_REG_2) \|
		BIT(BPF_REG_FP));
		}

		/* add modifiers if 'reg' maps to x64 registers r8..r15 */
		static u8 add_1mod(u8 byte, u32 reg)
		{
		@@ -771,9 +784,8 @@ st: if (is_imm8(insn->off))
		/* STX: (u8)(dst_reg + off) = src_reg */
		case BPF_STX \| BPF_MEM \| BPF_B:
		/* emit 'mov byte ptr [rax + off], al' */
		if (is_ereg(dst_reg) \|\| is_ereg(src_reg) \|\|
		/* have to add extra byte for x86 SIL, DIL regs */
		src_reg == BPF_REG_1 \|\| src_reg == BPF_REG_2)
		if (is_ereg(dst_reg) \|\| is_ereg_8l(src_reg))
		/* Add extra byte for eregs or SIL,DIL,BPL in src_reg */
		EMIT2(add_2mod(0x40, dst_reg, src_reg), 0x88);
		else
		EMIT1(0x88);

drivers/char/tpm/tpm_tis_core.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -329,6 +329,9 @@ static void disable_interrupts(struct tpm_chip *chip)
		u32 intmask;
		int rc;

		if (priv->irq == 0)
		return;

		rc = tpm_tis_read32(priv, TPM_INT_ENABLE(priv->locality), &intmask);
		if (rc < 0)
		intmask = 0;
		@@ -786,9 +789,12 @@ int tpm_tis_core_init(struct device dev, struct tpm_tis_data priv, int irq,
		if (irq) {
		tpm_tis_probe_irq_single(chip, intmask, IRQF_SHARED,
		irq);
		if (!(chip->flags & TPM_CHIP_FLAG_IRQ))
		if (!(chip->flags & TPM_CHIP_FLAG_IRQ)) {
		dev_err(&chip->dev, FW_BUG
		"TPM interrupt not working, polling instead\n");

		disable_interrupts(chip);
		}
		} else {
		tpm_tis_probe_irq(chip, intmask);
		}