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

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

Merge 5.4.158 into android11-5.4-lts 



Changes in 5.4.158
	scsi: core: Put LLD module refcnt after SCSI device is released
	vrf: Revert "Reset skb conntrack connection..."
	net: ethernet: microchip: lan743x: Fix skb allocation failure
	media: firewire: firedtv-avc: fix a buffer overflow in avc_ca_pmt()
	Revert "xhci: Set HCD flag to defer primary roothub registration"
	Revert "usb: core: hcd: Add support for deferring roothub registration"
	sfc: Fix reading non-legacy supported link modes
	Revert "drm/ttm: fix memleak in ttm_transfered_destroy"
	ARM: 9120/1: Revert "amba: make use of -1 IRQs warn"
	Linux 5.4.158

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I78389a9bc39dca878c4178c11e86adb80c458f8a
parents 553d3c41 c65356f0

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 157

SUBLEVEL = 158

EXTRAVERSION =

NAME = Kleptomaniac Octopus

drivers/amba/bus.c

+0 −3
Original line number Diff line number Diff line
@@ -375,9 +375,6 @@ static int amba_device_try_add(struct amba_device *dev, struct resource *parent) 
	void __iomem *tmp;

	int i, ret;



	WARN_ON(dev->irq[0] == (unsigned int)-1);

	WARN_ON(dev->irq[1] == (unsigned int)-1);



	ret = request_resource(parent, &dev->res);

	if (ret)

		goto err_out;

drivers/gpu/drm/ttm/ttm_bo_util.c

+0 −1
Original line number Diff line number Diff line
@@ -463,7 +463,6 @@ static void ttm_transfered_destroy(struct ttm_buffer_object *bo) 
	struct ttm_transfer_obj *fbo;



	fbo = container_of(bo, struct ttm_transfer_obj, base);

	dma_resv_fini(&fbo->base.base._resv);

	ttm_bo_put(fbo->bo);

	kfree(fbo);

}

drivers/media/firewire/firedtv-avc.c

+11 −3
Original line number Diff line number Diff line
@@ -1165,7 +1165,11 @@ int avc_ca_pmt(struct firedtv *fdtv, char *msg, int length) 
		read_pos += program_info_length;

		write_pos += program_info_length;

	}

	while (read_pos < length) {

	while (read_pos + 4 < length) {

		if (write_pos + 4 >= sizeof(c->operand) - 4) {

			ret = -EINVAL;

			goto out;

		}

		c->operand[write_pos++] = msg[read_pos++];

		c->operand[write_pos++] = msg[read_pos++];

		c->operand[write_pos++] = msg[read_pos++];
@@ -1177,13 +1181,17 @@ int avc_ca_pmt(struct firedtv *fdtv, char *msg, int length) 
		c->operand[write_pos++] = es_info_length >> 8;

		c->operand[write_pos++] = es_info_length & 0xff;

		if (es_info_length > 0) {

			if (read_pos >= length) {

				ret = -EINVAL;

				goto out;

			}

			pmt_cmd_id = msg[read_pos++];

			if (pmt_cmd_id != 1 && pmt_cmd_id != 4)

				dev_err(fdtv->device, "invalid pmt_cmd_id %d at stream level\n",

					pmt_cmd_id);



			if (es_info_length > sizeof(c->operand) - 4 -

					     write_pos) {

			if (es_info_length > sizeof(c->operand) - 4 - write_pos ||

			    es_info_length > length - read_pos) {

				ret = -EINVAL;

				goto out;

			}

drivers/media/firewire/firedtv-ci.c

+2 −0
Original line number Diff line number Diff line
@@ -134,6 +134,8 @@ static int fdtv_ca_pmt(struct firedtv *fdtv, void *arg) 
	} else {

		data_length = msg->msg[3];

	}

	if (data_length > sizeof(msg->msg) - data_pos)

		return -EINVAL;



	return avc_ca_pmt(fdtv, &msg->msg[data_pos], data_length);

}