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

Commit 7ada0835 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 5.4.170 into android11-5.4-lts 



Changes in 5.4.170
	HID: asus: Add depends on USB_HID to HID_ASUS Kconfig option
	tee: handle lookup of shm with reference count 0
	Input: i8042 - add deferred probe support
	Input: i8042 - enable deferred probe quirk for ASUS UM325UA
	tomoyo: Check exceeded quota early in tomoyo_domain_quota_is_ok().
	platform/x86: apple-gmux: use resource_size() with res
	memblock: fix memblock_phys_alloc() section mismatch error
	recordmcount.pl: fix typo in s390 mcount regex
	selinux: initialize proto variable in selinux_ip_postroute_compat()
	scsi: lpfc: Terminate string in lpfc_debugfs_nvmeio_trc_write()
	net/mlx5: DR, Fix NULL vs IS_ERR checking in dr_domain_init_resources
	udp: using datalen to cap ipv6 udp max gso segments
	selftests: Calculate udpgso segment count without header adjustment
	sctp: use call_rcu to free endpoint
	net: usb: pegasus: Do not drop long Ethernet frames
	net: lantiq_xrx200: fix statistics of received bytes
	NFC: st21nfca: Fix memory leak in device probe and remove
	ionic: Initialize the 'lif->dbid_inuse' bitmap
	net/mlx5e: Fix wrong features assignment in case of error
	selftests/net: udpgso_bench_tx: fix dst ip argument
	net/ncsi: check for error return from call to nla_put_u32
	fsl/fman: Fix missing put_device() call in fman_port_probe
	i2c: validate user data in compat ioctl
	nfc: uapi: use kernel size_t to fix user-space builds
	uapi: fix linux/nfc.h userspace compilation errors
	xhci: Fresco FL1100 controller should not have BROKEN_MSI quirk set.
	usb: gadget: f_fs: Clear ffs_eventfd in ffs_data_clear.
	usb: mtu3: add memory barrier before set GPD's HWO
	usb: mtu3: fix list_head check warning
	usb: mtu3: set interval of FS intr and isoc endpoint
	binder: fix async_free_space accounting for empty parcels
	scsi: vmw_pvscsi: Set residual data length conditionally
	Input: appletouch - initialize work before device registration
	Input: spaceball - fix parsing of movement data packets
	net: fix use-after-free in tw_timer_handler
	perf script: Fix CPU filtering of a script's switch events
	Linux 5.4.170

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ic66d754505081f001b420af0ee4c8da1edf5c27f
parents 2bee9bd5 047dedaa

Documentation/admin-guide/kernel-parameters.txt

+2 −0
Original line number Diff line number Diff line
@@ -1487,6 +1487,8 @@ 
			architectures force reset to be always executed

	i8042.unlock	[HW] Unlock (ignore) the keylock

	i8042.kbdreset	[HW] Reset device connected to KBD port

	i8042.probe_defer

			[HW] Allow deferred probing upon i8042 probe errors



	i810=		[HW,DRM]

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 169

SUBLEVEL = 170

EXTRAVERSION =

NAME = Kleptomaniac Octopus

drivers/android/binder_alloc.c

+1 −1
Original line number Diff line number Diff line
@@ -662,7 +662,7 @@ static void binder_free_buf_locked(struct binder_alloc *alloc, 
	BUG_ON(buffer->user_data > alloc->buffer + alloc->buffer_size);



	if (buffer->async_transaction) {

		alloc->free_async_space += size + sizeof(struct binder_buffer);

		alloc->free_async_space += buffer_size + sizeof(struct binder_buffer);



		binder_alloc_debug(BINDER_DEBUG_BUFFER_ALLOC_ASYNC,

			     "%d: binder_free_buf size %zd async free %zd\n",

drivers/hid/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -149,6 +149,7 @@ config HID_APPLEIR 


config HID_ASUS

	tristate "Asus"

	depends on USB_HID

	depends on LEDS_CLASS

	depends on ASUS_WMI || ASUS_WMI=n

	select POWER_SUPPLY

drivers/i2c/i2c-dev.c

+3 −0
Original line number Diff line number Diff line
@@ -536,6 +536,9 @@ static long compat_i2cdev_ioctl(struct file *file, unsigned int cmd, unsigned lo 
				   sizeof(rdwr_arg)))

			return -EFAULT;



		if (!rdwr_arg.msgs || rdwr_arg.nmsgs == 0)

			return -EINVAL;



		if (rdwr_arg.nmsgs > I2C_RDWR_IOCTL_MAX_MSGS)

			return -EINVAL;