Unverified Commit 92cdca1a authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15146 Revert "media: uvcvideo: Require entities to have a non-zero unique ID" 

Merge Pull Request from: @ci-robot 
 
PR sync from: Tong Tiangen <tongtiangen@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/OJYUCM5DOID6YWVXXJSETCCZYT43BO6G/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBN5F1 
 
Link:https://gitee.com/openeuler/kernel/pulls/15146

 

Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: default avatarLi Nan <linan122@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parents 21b73603 56ae0cc2

drivers/media/usb/uvc/uvc_driver.c

+24 −39
Original line number Diff line number Diff line
@@ -1019,27 +1019,14 @@ static int uvc_parse_streaming(struct uvc_device *dev, 
	return ret;

}



static struct uvc_entity *uvc_alloc_new_entity(struct uvc_device *dev, u16 type,

					       u16 id, unsigned int num_pads,

					       unsigned int extra_size)

static struct uvc_entity *uvc_alloc_entity(u16 type, u8 id,

		unsigned int num_pads, unsigned int extra_size)

{

	struct uvc_entity *entity;

	unsigned int num_inputs;

	unsigned int size;

	unsigned int i;



	/* Per UVC 1.1+ spec 3.7.2, the ID should be non-zero. */

	if (id == 0) {

		dev_err(&dev->udev->dev, "Found Unit with invalid ID 0.\n");

		return ERR_PTR(-EINVAL);

	}



	/* Per UVC 1.1+ spec 3.7.2, the ID is unique. */

	if (uvc_entity_by_id(dev, id)) {

		dev_err(&dev->udev->dev, "Found multiple Units with ID %u\n", id);

		return ERR_PTR(-EINVAL);

	}



	extra_size = roundup(extra_size, sizeof(*entity->pads));

	if (num_pads)

		num_inputs = type & UVC_TERM_OUTPUT ? num_pads : num_pads - 1;
@@ -1049,7 +1036,7 @@ static struct uvc_entity *uvc_alloc_new_entity(struct uvc_device *dev, u16 type, 
	     + num_inputs;

	entity = kzalloc(size, GFP_KERNEL);

	if (entity == NULL)

		return ERR_PTR(-ENOMEM);

		return NULL;



	entity->id = id;

	entity->type = type;
@@ -1120,10 +1107,10 @@ static int uvc_parse_vendor_control(struct uvc_device *dev, 
			break;

		}



		unit = uvc_alloc_new_entity(dev, UVC_VC_EXTENSION_UNIT,

					    buffer[3], p + 1, 2 * n);

		if (IS_ERR(unit))

			return PTR_ERR(unit);

		unit = uvc_alloc_entity(UVC_VC_EXTENSION_UNIT, buffer[3],

					p + 1, 2*n);

		if (unit == NULL)

			return -ENOMEM;



		memcpy(unit->extension.guidExtensionCode, &buffer[4], 16);

		unit->extension.bNumControls = buffer[20];
@@ -1234,10 +1221,10 @@ static int uvc_parse_standard_control(struct uvc_device *dev, 
			return -EINVAL;

		}



		term = uvc_alloc_new_entity(dev, type | UVC_TERM_INPUT,

					    buffer[3], 1, n + p);

		if (IS_ERR(term))

			return PTR_ERR(term);

		term = uvc_alloc_entity(type | UVC_TERM_INPUT, buffer[3],

					1, n + p);

		if (term == NULL)

			return -ENOMEM;



		if (UVC_ENTITY_TYPE(term) == UVC_ITT_CAMERA) {

			term->camera.bControlSize = n;
@@ -1293,10 +1280,10 @@ static int uvc_parse_standard_control(struct uvc_device *dev, 
			return 0;

		}



		term = uvc_alloc_new_entity(dev, type | UVC_TERM_OUTPUT,

					    buffer[3], 1, 0);

		if (IS_ERR(term))

			return PTR_ERR(term);

		term = uvc_alloc_entity(type | UVC_TERM_OUTPUT, buffer[3],

					1, 0);

		if (term == NULL)

			return -ENOMEM;



		memcpy(term->baSourceID, &buffer[7], 1);
@@ -1317,10 +1304,9 @@ static int uvc_parse_standard_control(struct uvc_device *dev, 
			return -EINVAL;

		}



		unit = uvc_alloc_new_entity(dev, buffer[2], buffer[3],

					    p + 1, 0);

		if (IS_ERR(unit))

			return PTR_ERR(unit);

		unit = uvc_alloc_entity(buffer[2], buffer[3], p + 1, 0);

		if (unit == NULL)

			return -ENOMEM;



		memcpy(unit->baSourceID, &buffer[5], p);
@@ -1342,9 +1328,9 @@ static int uvc_parse_standard_control(struct uvc_device *dev, 
			return -EINVAL;

		}



		unit = uvc_alloc_new_entity(dev, buffer[2], buffer[3], 2, n);

		if (IS_ERR(unit))

			return PTR_ERR(unit);

		unit = uvc_alloc_entity(buffer[2], buffer[3], 2, n);

		if (unit == NULL)

			return -ENOMEM;



		memcpy(unit->baSourceID, &buffer[4], 1);

		unit->processing.wMaxMultiplier =
@@ -1373,10 +1359,9 @@ static int uvc_parse_standard_control(struct uvc_device *dev, 
			return -EINVAL;

		}



		unit = uvc_alloc_new_entity(dev, buffer[2], buffer[3],

					    p + 1, n);

		if (IS_ERR(unit))

			return PTR_ERR(unit);

		unit = uvc_alloc_entity(buffer[2], buffer[3], p + 1, n);

		if (unit == NULL)

			return -ENOMEM;



		memcpy(unit->extension.guidExtensionCode, &buffer[4], 16);

		unit->extension.bNumControls = buffer[20];