Commit 3881a459 authored Apr 29, 2021 by Greg Kroah-Hartman

Merge 4.19.189 into android-4.19-stable



Changes in 4.19.189
	net/sctp: fix race condition in sctp_destroy_sock
	Input: nspire-keypad - enable interrupts only when opened
	gpio: sysfs: Obey valid_mask
	dmaengine: dw: Make it dependent to HAS_IOMEM
	ARM: dts: Drop duplicate sha2md5_fck to fix clk_disable race
	ARM: dts: Fix moving mmc devices with aliases for omap4 & 5
	lockdep: Add a missing initialization hint to the "INFO: Trying to register non-static key" message
	arc: kernel: Return -EFAULT if copy_to_user() fails
	neighbour: Disregard DEAD dst in neigh_update
	ARM: keystone: fix integer overflow warning
	drm/msm: Fix a5xx/a6xx timestamps
	ASoC: fsl_esai: Fix TDM slot setup for I2S mode
	scsi: scsi_transport_srp: Don't block target in SRP_PORT_LOST state
	net: ieee802154: stop dump llsec keys for monitors
	net: ieee802154: stop dump llsec devs for monitors
	net: ieee802154: forbid monitor for add llsec dev
	net: ieee802154: stop dump llsec devkeys for monitors
	net: ieee802154: forbid monitor for add llsec devkey
	net: ieee802154: stop dump llsec seclevels for monitors
	net: ieee802154: forbid monitor for add llsec seclevel
	pcnet32: Use pci_resource_len to validate PCI resource
	mac80211: clear sta->fast_rx when STA removed from 4-addr VLAN
	Input: s6sy761 - fix coordinate read bit shift
	Input: i8042 - fix Pegatron C15B ID entry
	HID: wacom: set EV_KEY and EV_ABS only for non-HID_GENERIC type of devices
	dm verity fec: fix misaligned RS roots IO
	readdir: make sure to verify directory entry for legacy interfaces too
	arm64: fix inline asm in load_unaligned_zeropad()
	arm64: alternatives: Move length validation in alternative_{insn, endif}
	scsi: libsas: Reset num_scatter if libata marks qc as NODATA
	netfilter: conntrack: do not print icmpv6 as unknown via /proc
	netfilter: nft_limit: avoid possible divide error in nft_limit_init
	net: davicom: Fix regulator not turned off on failed probe
	net: sit: Unregister catch-all devices
	net: ip6_tunnel: Unregister catch-all devices
	i40e: fix the panic when running bpf in xdpdrv mode
	ibmvnic: avoid calling napi_disable() twice
	ibmvnic: remove duplicate napi_schedule call in do_reset function
	ibmvnic: remove duplicate napi_schedule call in open function
	ARM: footbridge: fix PCI interrupt mapping
	ARM: 9071/1: uprobes: Don't hook on thumb instructions
	net: phy: marvell: fix detection of PHY on Topaz switches
	gup: document and work around "COW can break either way" issue
	pinctrl: lewisburg: Update number of pins in community
	locking/qrwlock: Fix ordering in queued_write_lock_slowpath()
	perf/x86/intel/uncore: Remove uncore extra PCI dev HSWEP_PCI_PCU_3
	HID: google: add don USB id
	HID: alps: fix error return code in alps_input_configured()
	HID: wacom: Assign boolean values to a bool variable
	ARM: dts: Fix swapped mmc order for omap3
	net: geneve: check skb is large enough for IPv4/IPv6 header
	s390/entry: save the caller of psw_idle
	xen-netback: Check for hotplug-status existence before watching
	cavium/liquidio: Fix duplicate argument
	ia64: fix discontig.c section mismatches
	ia64: tools: remove duplicate definition of ia64_mf() on ia64
	x86/crash: Fix crash_setup_memmap_entries() out-of-bounds access
	net: hso: fix NULL-deref on disconnect regression
	USB: CDC-ACM: fix poison/unpoison imbalance
	Linux 4.19.189

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

parents 67f54880 97a8651c

Makefile

+1 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		VERSION = 4
		PATCHLEVEL = 19
		SUBLEVEL = 188
		SUBLEVEL = 189
		EXTRAVERSION =
		NAME = "People's Front"

arch/arc/kernel/signal.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -99,7 +99,7 @@ stash_usr_regs(struct rt_sigframe __user sf, struct pt_regs regs,
		sizeof(sf->uc.uc_mcontext.regs.scratch));
		err \|= __copy_to_user(&sf->uc.uc_sigmask, set, sizeof(sigset_t));

		return err;
		return err ? -EFAULT : 0;
		}

		static int restore_usr_regs(struct pt_regs regs, struct rt_sigframe __user sf)
		@@ -113,7 +113,7 @@ static int restore_usr_regs(struct pt_regs regs, struct rt_sigframe __user sf)
		&(sf->uc.uc_mcontext.regs.scratch),
		sizeof(sf->uc.uc_mcontext.regs.scratch));
		if (err)
		return err;
		return -EFAULT;

		set_current_blocked(&set);
		regs->bta = uregs.scratch.bta;

arch/arm/boot/dts/omap3.dtsi

+3 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,9 @@
		i2c0 = &i2c1;
		i2c1 = &i2c2;
		i2c2 = &i2c3;
		mmc0 = &mmc1;
		mmc1 = &mmc2;
		mmc2 = &mmc3;
		serial0 = &uart1;
		serial1 = &uart2;
		serial2 = &uart3;

arch/arm/boot/dts/omap4.dtsi

+5 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,11 @@
		i2c1 = &i2c2;
		i2c2 = &i2c3;
		i2c3 = &i2c4;
		mmc0 = &mmc1;
		mmc1 = &mmc2;
		mmc2 = &mmc3;
		mmc3 = &mmc4;
		mmc4 = &mmc5;
		serial0 = &uart1;
		serial1 = &uart2;
		serial2 = &uart3;

arch/arm/boot/dts/omap44xx-clocks.dtsi

+0 −8

Original line number	Diff line number	Diff line
		@@ -773,14 +773,6 @@
		ti,max-div = <2>;
		};

		sha2md5_fck: sha2md5_fck@15c8 {
		#clock-cells = <0>;
		compatible = "ti,gate-clock";
		clocks = <&l3_div_ck>;
		ti,bit-shift = <1>;
		reg = <0x15c8>;
		};

		usb_phy_cm_clk32k: usb_phy_cm_clk32k@640 {
		#clock-cells = <0>;
		compatible = "ti,gate-clock";