Merge "media: uvcvideo: Avoid cyclic entity chains due to malformed USB descriptors" (902704b3) · Commits · e / devices / android_kernel_sony_msm8998

drivers/media/usb/uvc/uvc_driver.c

+12 −0

Original line number	Diff line number	Diff line
		@@ -1411,6 +1411,11 @@ static int uvc_scan_chain_forward(struct uvc_video_chain *chain,
		break;
		if (forward == prev)
		continue;
		if (forward->chain.next \|\| forward->chain.prev) {
		uvc_trace(UVC_TRACE_DESCR, "Found reference to "
		"entity %d already in chain.\n", forward->id);
		return -EINVAL;
		}

		switch (UVC_ENTITY_TYPE(forward)) {
		case UVC_VC_EXTENSION_UNIT:
		@@ -1492,6 +1497,13 @@ static int uvc_scan_chain_backward(struct uvc_video_chain *chain,
		return -1;
		}

		if (term->chain.next \|\| term->chain.prev) {
		uvc_trace(UVC_TRACE_DESCR, "Found reference to "
		"entity %d already in chain.\n",
		term->id);
		return -EINVAL;
		}

		if (uvc_trace_param & UVC_TRACE_PROBE)
		printk(" %d", term->id);