diff mbox series

[5.10,065/102] media: uvcvideo: Allow entities with no pads

Message ID	20210305120906.479686265@linuxfoundation.org
State	New
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Ricardo Ribalda <ribalda@chromium.org>, Laurent Pinchart <laurent.pinchart@ideasonboard.com>, Mauro Carvalho Chehab <mchehab+huawei@kernel.org>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 5.10 065/102] media: uvcvideo: Allow entities with no pads Date: Fri, 5 Mar 2021 13:21:24 +0100 Message-Id: <20210305120906.479686265@linuxfoundation.org> In-Reply-To: <20210305120903.276489876@linuxfoundation.org> References: <20210305120903.276489876@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.10,002/102] Input: elantech - fix protocol errors for some trackpoints in SMBus mode [5.10,003/102] Input: elan_i2c - add new trackpoint report type 0x5F [5.10,004/102] drm/virtio: use kvmalloc for large allocations [5.10,005/102] x86/build: Treat R_386_PLT32 relocation as R_386_PC32 [5.10,006/102] JFS: more checks for invalid superblock [5.10,007/102] sched/core: Allow try_invoke_on_locked_down_task() with irqs disabled [5.10,008/102] udlfb: Fix memory leak in dlfb_usb_probe [5.10,009/102] media: mceusb: sanity check for prescaler value [5.10,010/102] erofs: fix shift-out-of-bounds of blkszbits [5.10,011/102] media: v4l2-ctrls.c: fix shift-out-of-bounds in std_validate [5.10,012/102] xfs: Fix assert failure in xfs_setattr_size() [5.10,013/102] net/af_iucv: remove WARN_ONCE on malformed RX packets [5.10,014/102] smackfs: restrict bytes count in smackfs write functions [5.10,015/102] tomoyo: ignore data race while checking quota [5.10,016/102] net: fix up truesize of cloned skb in skb_prepare_for_shift() [5.10,017/102] riscv: Get rid of MAX_EARLY_MAPPING_SIZE [5.10,018/102] nbd: handle device refs for DESTROY_ON_DISCONNECT properly [5.10,019/102] mm/hugetlb.c: fix unnecessary address expansion of pmd sharing [5.10,020/102] RDMA/rtrs: Do not signal for heatbeat [5.10,021/102] RDMA/rtrs-clt: Use bitmask to check sess->flags [5.10,022/102] RDMA/rtrs-srv: Do not signal REG_MR [5.10,023/102] tcp: fix tcp_rmem documentation [5.10,024/102] mptcp: do not wakeup listener for MPJ subflows [5.10,025/102] net: bridge: use switchdev for port flags set through sysfs too [5.10,026/102] net/sched: cls_flower: Reject invalid ct_state flags rules [5.10,027/102] net: dsa: tag_rtl4_a: Support also egress tags [5.10,028/102] net: ag71xx: remove unnecessary MTU reservation [5.10,029/102] net: hsr: add support for EntryForgetTime [5.10,030/102] net: psample: Fix netlink skb length with tunnel info [5.10,031/102] net: fix dev_ifsioc_locked() race condition [5.10,032/102] dt-bindings: ethernet-controller: fix fixed-link specification [5.10,033/102] dt-bindings: net: btusb: DT fix s/interrupt-name/interrupt-names/ [5.10,034/102] ASoC: qcom: Remove useless debug print [5.10,035/102] rsi: Fix TX EAPOL packet handling against iwlwifi AP [5.10,036/102] rsi: Move card interrupt handling to RX thread [5.10,037/102] rcu/nocb: Trigger self-IPI on late deferred wake up before user resume [5.10,038/102] entry: Explicitly flush pending rcuog wakeup before last rescheduling point [5.10,039/102] entry/kvm: Explicitly flush pending rcuog wakeup before last rescheduling point [5.10,040/102] EDAC/amd64: Do not load on family 0x15, model 0x13 [5.10,041/102] staging: fwserial: Fix error handling in fwserial_create [5.10,042/102] x86/reboot: Add Zotac ZBOX CI327 nano PCI reboot quirk [5.10,043/102] vt/consolemap: do font sum unsigned [5.10,044/102] wlcore: Fix command execute failure 19 for wl12xx [5.10,045/102] Bluetooth: hci_h5: Set HCI_QUIRK_SIMULTANEOUS_DISCOVERY for btrtl [5.10,046/102] Bluetooth: btusb: fix memory leak on suspend and resume [5.10,047/102] mt76: mt7615: reset token when mac_reset happens [5.10,048/102] pktgen: fix misuse of BUG_ON() in pktgen_thread_worker() [5.10,049/102] ath10k: fix wmi mgmt tx queue full due to race condition [5.10,050/102] net: sfp: add mode quirk for GPON module Ubiquiti U-Fiber Instant [5.10,051/102] Bluetooth: Add new HCI_QUIRK_NO_SUSPEND_NOTIFIER quirk [5.10,052/102] Bluetooth: Fix null pointer dereference in amp_read_loc_assoc_final_data [5.10,053/102] staging: most: sound: add sanity check for function argument [5.10,054/102] staging: bcm2835-audio: Replace unsafe strcpy() with strscpy() [5.10,055/102] brcmfmac: Add DMI nvram filename quirk for Predia Basic tablet [5.10,056/102] brcmfmac: Add DMI nvram filename quirk for Voyo winpad A15 tablet [5.10,057/102] drm/hisilicon: Fix use-after-free [5.10,058/102] crypto: tcrypt - avoid signed overflow in byte count [5.10,059/102] fs: make unlazy_walk() error handling consistent [5.10,060/102] drm/amdgpu: Add check to prevent IH overflow [5.10,061/102] PCI: Add a REBAR size quirk for Sapphire RX 5600 XT Pulse [5.10,062/102] ASoC: Intel: bytcr_rt5640: Add new BYT_RT5640_NO_SPEAKERS quirk-flag [5.10,063/102] drm/amd/display: Guard against NULL pointer deref when get_i2c_info fails [5.10,064/102] drm/amd/amdgpu: add error handling to amdgpu_virt_read_pf2vf_data [5.10,065/102] media: uvcvideo: Allow entities with no pads [5.10,066/102] f2fs: handle unallocated section and zone on pinned/atgc [5.10,067/102] f2fs: fix to set/clear I_LINKABLE under i_lock [5.10,068/102] nvme-core: add cancel tagset helpers [5.10,069/102] nvme-rdma: add clean action for failed reconnection [5.10,070/102] nvme-tcp: add clean action for failed reconnection [5.10,071/102] ASoC: Intel: Add DMI quirk table to soc_intel_is_byt_cr() [5.10,072/102] btrfs: fix error handling in commit_fs_roots [5.10,073/102] drm/amdgpu: enable only one high prio compute queue [5.10,074/102] perf/x86/kvm: Add Cascade Lake Xeon steppings to isolation_ucodes[] [5.10,075/102] ASoC: Intel: sof-sdw: indent and add quirks consistently [5.10,076/102] ASoC: Intel: sof_sdw: detect DMIC number based on mach params [5.10,077/102] parisc: Bump 64-bit IRQ stack size to 64 KB [5.10,078/102] sched/features: Fix hrtick reprogramming [5.10,079/102] ASoC: Intel: bytcr_rt5640: Add quirk for the Estar Beauty HD MID 7316R tablet [5.10,080/102] ASoC: Intel: bytcr_rt5640: Add quirk for the Voyo Winpad A15 tablet [5.10,081/102] ASoC: Intel: bytcr_rt5651: Add quirk for the Jumper EZpad 7 tablet [5.10,082/102] ASoC: Intel: bytcr_rt5640: Add quirk for the Acer One S1002 tablet [5.10,083/102] scsi: iscsi: Restrict sessions and handles to admin capabilities [5.10,084/102] scsi: iscsi: Ensure sysfs attributes are limited to PAGE_SIZE [5.10,085/102] scsi: iscsi: Verify lengths on passthrough PDUs [5.10,086/102] Xen/gnttab: handle p2m update errors on a per-slot basis [5.10,087/102] xen-netback: respect gnttab_map_refs()s return value [5.10,088/102] xen: fix p2m size in dom0 for disabled memory hotplug case [5.10,089/102] zsmalloc: account the number of compacted pages correctly [5.10,090/102] remoteproc/mediatek: Fix kernel test robot warning [5.10,091/102] swap: fix swapfile read/write offset [5.10,092/102] powerpc/sstep: Check instruction validity against ISA version before emulation [5.10,093/102] powerpc/sstep: Fix incorrect return from analyze_instr() [5.10,094/102] tty: fix up iterate_tty_read() EOVERFLOW handling [5.10,095/102] tty: fix up hung_up_tty_read() conversion [5.10,096/102] tty: clean up legacy leftovers from n_tty line discipline [5.10,097/102] tty: teach n_tty line discipline about the new "cookie continuations" [5.10,098/102] tty: teach the n_tty ICANON case about the new "cookie continuations" too [5.10,099/102] media: v4l: ioctl: Fix memory leak in video_usercopy [5.10,100/102] ALSA: hda/realtek: Add quirk for Clevo NH55RZQ [5.10,101/102] ALSA: hda/realtek: Add quirk for Intel NUC 10 [5.10,102/102] ALSA: hda/realtek: Apply dual codec quirks for MSI Godlike X570 board

Commit Message

Greg Kroah-Hartman March 5, 2021, 12:21 p.m. UTC

From: Ricardo Ribalda <ribalda@chromium.org>

[ Upstream commit 7532dad6634031d083df7af606fac655b8d08b5c ]

Avoid an underflow while calculating the number of inputs for entities
with zero pads.

Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/media/usb/uvc/uvc_driver.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff mbox series

Patch

diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
index ddb9eaa11be7..5ad528264135 100644
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
@@ -1028,7 +1028,10 @@  static struct uvc_entity *uvc_alloc_entity(u16 type, u8 id,
 	unsigned int i;
 
 	extra_size = roundup(extra_size, sizeof(*entity->pads));
-	num_inputs = (type & UVC_TERM_OUTPUT) ? num_pads : num_pads - 1;
+	if (num_pads)
+		num_inputs = type & UVC_TERM_OUTPUT ? num_pads : num_pads - 1;
+	else
+		num_inputs = 0;
 	size = sizeof(*entity) + extra_size + sizeof(*entity->pads) * num_pads
 	     + num_inputs;
 	entity = kzalloc(size, GFP_KERNEL);
@@ -1044,7 +1047,7 @@  static struct uvc_entity *uvc_alloc_entity(u16 type, u8 id,
 
 	for (i = 0; i < num_inputs; ++i)
 		entity->pads[i].flags = MEDIA_PAD_FL_SINK;
-	if (!UVC_ENTITY_IS_OTERM(entity))
+	if (!UVC_ENTITY_IS_OTERM(entity) && num_pads)
 		entity->pads[num_pads-1].flags = MEDIA_PAD_FL_SOURCE;
 
 	entity->bNrInPins = num_inputs;