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

Commit 22411ee1 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 5.4.171 into android11-5.4-lts 



Changes in 5.4.171
	f2fs: quota: fix potential deadlock
	Input: touchscreen - Fix backport of a02dcde595f7cbd240ccd64de96034ad91cffc40
	selftests: x86: fix [-Wstringop-overread] warn in test_process_vm_readv()
	tracing: Fix check for trace_percpu_buffer validity in get_trace_buf()
	tracing: Tag trace_percpu_buffer as a percpu pointer
	ieee802154: atusb: fix uninit value in atusb_set_extended_addr
	iavf: Fix limit of total number of queues to active queues of VF
	RDMA/core: Don't infoleak GRH fields
	RDMA/uverbs: Check for null return of kmalloc_array
	mac80211: initialize variable have_higher_than_11mbit
	i40e: fix use-after-free in i40e_sync_filters_subtask()
	i40e: Fix for displaying message regarding NVM version
	i40e: Fix incorrect netdev's real number of RX/TX queues
	ipv4: Check attribute length for RTA_GATEWAY in multipath route
	ipv4: Check attribute length for RTA_FLOW in multipath route
	ipv6: Check attribute length for RTA_GATEWAY in multipath route
	ipv6: Check attribute length for RTA_GATEWAY when deleting multipath route
	lwtunnel: Validate RTA_ENCAP_TYPE attribute length
	batman-adv: mcast: don't send link-local multicast to mcast routers
	sch_qfq: prevent shift-out-of-bounds in qfq_init_qdisc
	net: phy: micrel: set soft_reset callback to genphy_soft_reset for KSZ8081
	xfs: map unwritten blocks in XFS_IOC_{ALLOC,FREE}SP just like fallocate
	power: supply: core: Break capacity loop
	power: reset: ltc2952: Fix use of floating point literals
	rndis_host: support Hytera digital radios
	phonet: refcount leak in pep_sock_accep
	ipv6: Continue processing multipath route even if gateway attribute is invalid
	ipv6: Do cleanup if attribute validation fails in multipath route
	usb: mtu3: fix interval value for intr and isoc
	scsi: libiscsi: Fix UAF in iscsi_conn_get_param()/iscsi_conn_teardown()
	ip6_vti: initialize __ip6_tnl_parm struct in vti6_siocdevprivate
	net: udp: fix alignment problem in udp4_seq_show()
	atlantic: Fix buff_ring OOB in aq_ring_rx_clean
	mISDN: change function names to avoid conflicts
	Linux 5.4.171

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I365c9b88d2ba4746b4477d5a47ca5604cd1ea156
parents 7ada0835 0a4ce497

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 170

SUBLEVEL = 171

EXTRAVERSION =

NAME = Kleptomaniac Octopus

drivers/infiniband/core/uverbs_marshall.c

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ void ib_copy_ah_attr_to_user(struct ib_device *device, 
	struct rdma_ah_attr *src = ah_attr;

	struct rdma_ah_attr conv_ah;



	memset(&dst->grh.reserved, 0, sizeof(dst->grh.reserved));

	memset(&dst->grh, 0, sizeof(dst->grh));



	if ((ah_attr->type == RDMA_AH_ATTR_TYPE_OPA) &&

	    (rdma_ah_get_dlid(ah_attr) > be16_to_cpu(IB_LID_PERMISSIVE)) &&

drivers/infiniband/core/uverbs_uapi.c

+3 −0
Original line number Diff line number Diff line
@@ -450,6 +450,9 @@ static int uapi_finalize(struct uverbs_api *uapi) 
	uapi->num_write_ex = max_write_ex + 1;

	data = kmalloc_array(uapi->num_write + uapi->num_write_ex,

			     sizeof(*uapi->write_methods), GFP_KERNEL);

	if (!data)

		return -ENOMEM;



	for (i = 0; i != uapi->num_write + uapi->num_write_ex; i++)

		data[i] = &uapi->notsupp_method;

	uapi->write_methods = data;

drivers/input/touchscreen/of_touchscreen.c

+4 −4
Original line number Diff line number Diff line
@@ -77,8 +77,8 @@ void touchscreen_parse_properties(struct input_dev *input, bool multitouch, 
	axis = multitouch ? ABS_MT_POSITION_X : ABS_X;

	data_present = touchscreen_get_prop_u32(dev, "touchscreen-min-x",

						input_abs_get_min(input, axis),

						&minimum) |

		       touchscreen_get_prop_u32(dev, "touchscreen-size-x",

						&minimum);

	data_present |= touchscreen_get_prop_u32(dev, "touchscreen-size-x",

						input_abs_get_max(input,

								  axis) + 1,

						&maximum);
@@ -91,8 +91,8 @@ void touchscreen_parse_properties(struct input_dev *input, bool multitouch, 
	axis = multitouch ? ABS_MT_POSITION_Y : ABS_Y;

	data_present = touchscreen_get_prop_u32(dev, "touchscreen-min-y",

						input_abs_get_min(input, axis),

						&minimum) |

		       touchscreen_get_prop_u32(dev, "touchscreen-size-y",

						&minimum);

	data_present |= touchscreen_get_prop_u32(dev, "touchscreen-size-y",

						input_abs_get_max(input,

								  axis) + 1,

						&maximum);

drivers/isdn/mISDN/core.c

+3 −3
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ mISDNInit(void) 
	err = mISDN_inittimer(&debug);

	if (err)

		goto error2;

	err = l1_init(&debug);

	err = Isdnl1_Init(&debug);

	if (err)

		goto error3;

	err = Isdnl2_Init(&debug);
@@ -395,7 +395,7 @@ mISDNInit(void) 
error5:

	Isdnl2_cleanup();

error4:

	l1_cleanup();

	Isdnl1_cleanup();

error3:

	mISDN_timer_cleanup();

error2:
@@ -408,7 +408,7 @@ static void mISDN_cleanup(void) 
{

	misdn_sock_cleanup();

	Isdnl2_cleanup();

	l1_cleanup();

	Isdnl1_cleanup();

	mISDN_timer_cleanup();

	class_unregister(&mISDN_class);