From 25e912a15650c8cf0c5dd5ec43a987c16312c89a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 3 Oct 2025 15:21:03 +0200 Subject: [PATCH] 5.15-stable patches added patches: iommu-amd-add-map-unmap_pages-iommu_domain_ops-callback-support.patch media-b2c2-fix-use-after-free-causing-by-irq_check_work-in-flexcop_pci_remove.patch media-rc-fix-races-with-imon_disconnect.patch media-uvcvideo-mark-invalid-entities-with-id-uvc_invalid_entity_id.patch scsi-target-target_core_configfs-add-length-check-to-avoid-buffer-overflow.patch series --- ...es-iommu_domain_ops-callback-support.patch | 41 +++ ...irq_check_work-in-flexcop_pci_remove.patch | 119 +++++++ ...ia-rc-fix-races-with-imon_disconnect.patch | 160 +++++++++ ...tities-with-id-uvc_invalid_entity_id.patch | 309 ++++++++++++++++++ ...ength-check-to-avoid-buffer-overflow.patch | 47 +++ queue-5.15/series | 5 + 6 files changed, 681 insertions(+) create mode 100644 queue-5.15/iommu-amd-add-map-unmap_pages-iommu_domain_ops-callback-support.patch create mode 100644 queue-5.15/media-b2c2-fix-use-after-free-causing-by-irq_check_work-in-flexcop_pci_remove.patch create mode 100644 queue-5.15/media-rc-fix-races-with-imon_disconnect.patch create mode 100644 queue-5.15/media-uvcvideo-mark-invalid-entities-with-id-uvc_invalid_entity_id.patch create mode 100644 queue-5.15/scsi-target-target_core_configfs-add-length-check-to-avoid-buffer-overflow.patch create mode 100644 queue-5.15/series diff --git a/queue-5.15/iommu-amd-add-map-unmap_pages-iommu_domain_ops-callback-support.patch b/queue-5.15/iommu-amd-add-map-unmap_pages-iommu_domain_ops-callback-support.patch new file mode 100644 index 0000000000..4d1d4f06e7 --- /dev/null +++ b/queue-5.15/iommu-amd-add-map-unmap_pages-iommu_domain_ops-callback-support.patch @@ -0,0 +1,41 @@ +From 6b080c4e815ceba3c08ffa980c858595c07e786a Mon Sep 17 00:00:00 2001 +From: Vasant Hegde +Date: Thu, 25 Aug 2022 06:39:33 +0000 +Subject: iommu/amd: Add map/unmap_pages() iommu_domain_ops callback support + +From: Vasant Hegde + +commit 6b080c4e815ceba3c08ffa980c858595c07e786a upstream. + +Implement the map_pages() and unmap_pages() callback for the AMD IOMMU +driver to allow calls from iommu core to map and unmap multiple pages. +Also deprecate map/unmap callbacks. + +Finally gatherer is not updated by iommu_v1_unmap_pages(). Hence pass +NULL instead of gather to iommu_v1_unmap_pages. + +Suggested-by: Robin Murphy +Signed-off-by: Vasant Hegde +Link: https://lore.kernel.org/r/20220825063939.8360-4-vasant.hegde@amd.com +Signed-off-by: Joerg Roedel +[ partial bacport of the original patch, just what is needed to fix a + bug in 5.15.y only ] +Fixes: fc65d0acaf23 ("iommu/amd: Selective flush on unmap") +Signed-off-by: Zhichuang Sun +Signed-off-by: Greg Kroah-Hartman +--- + drivers/iommu/amd/iommu.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/iommu/amd/iommu.c ++++ b/drivers/iommu/amd/iommu.c +@@ -2121,7 +2121,8 @@ static size_t amd_iommu_unmap(struct iom + + r = (ops->unmap) ? ops->unmap(ops, iova, page_size, gather) : 0; + +- amd_iommu_iotlb_gather_add_page(dom, gather, iova, page_size); ++ if (r) ++ amd_iommu_iotlb_gather_add_page(dom, gather, iova, r); + + return r; + } diff --git a/queue-5.15/media-b2c2-fix-use-after-free-causing-by-irq_check_work-in-flexcop_pci_remove.patch b/queue-5.15/media-b2c2-fix-use-after-free-causing-by-irq_check_work-in-flexcop_pci_remove.patch new file mode 100644 index 0000000000..6b9b49d456 --- /dev/null +++ b/queue-5.15/media-b2c2-fix-use-after-free-causing-by-irq_check_work-in-flexcop_pci_remove.patch @@ -0,0 +1,119 @@ +From 01e03fb7db419d39e18d6090d4873c1bff103914 Mon Sep 17 00:00:00 2001 +From: Duoming Zhou +Date: Wed, 17 Sep 2025 17:59:26 +0800 +Subject: media: b2c2: Fix use-after-free causing by irq_check_work in flexcop_pci_remove + +From: Duoming Zhou + +commit 01e03fb7db419d39e18d6090d4873c1bff103914 upstream. + +The original code uses cancel_delayed_work() in flexcop_pci_remove(), which +does not guarantee that the delayed work item irq_check_work has fully +completed if it was already running. This leads to use-after-free scenarios +where flexcop_pci_remove() may free the flexcop_device while irq_check_work +is still active and attempts to dereference the device. + +A typical race condition is illustrated below: + +CPU 0 (remove) | CPU 1 (delayed work callback) +flexcop_pci_remove() | flexcop_pci_irq_check_work() + cancel_delayed_work() | + flexcop_device_kfree(fc_pci->fc_dev) | + | fc = fc_pci->fc_dev; // UAF + +This is confirmed by a KASAN report: + +================================================================== +BUG: KASAN: slab-use-after-free in __run_timer_base.part.0+0x7d7/0x8c0 +Write of size 8 at addr ffff8880093aa8c8 by task bash/135 +... +Call Trace: + + dump_stack_lvl+0x55/0x70 + print_report+0xcf/0x610 + ? __run_timer_base.part.0+0x7d7/0x8c0 + kasan_report+0xb8/0xf0 + ? __run_timer_base.part.0+0x7d7/0x8c0 + __run_timer_base.part.0+0x7d7/0x8c0 + ? __pfx___run_timer_base.part.0+0x10/0x10 + ? __pfx_read_tsc+0x10/0x10 + ? ktime_get+0x60/0x140 + ? lapic_next_event+0x11/0x20 + ? clockevents_program_event+0x1d4/0x2a0 + run_timer_softirq+0xd1/0x190 + handle_softirqs+0x16a/0x550 + irq_exit_rcu+0xaf/0xe0 + sysvec_apic_timer_interrupt+0x70/0x80 + +... + +Allocated by task 1: + kasan_save_stack+0x24/0x50 + kasan_save_track+0x14/0x30 + __kasan_kmalloc+0x7f/0x90 + __kmalloc_noprof+0x1be/0x460 + flexcop_device_kmalloc+0x54/0xe0 + flexcop_pci_probe+0x1f/0x9d0 + local_pci_probe+0xdc/0x190 + pci_device_probe+0x2fe/0x470 + really_probe+0x1ca/0x5c0 + __driver_probe_device+0x248/0x310 + driver_probe_device+0x44/0x120 + __driver_attach+0xd2/0x310 + bus_for_each_dev+0xed/0x170 + bus_add_driver+0x208/0x500 + driver_register+0x132/0x460 + do_one_initcall+0x89/0x300 + kernel_init_freeable+0x40d/0x720 + kernel_init+0x1a/0x150 + ret_from_fork+0x10c/0x1a0 + ret_from_fork_asm+0x1a/0x30 + +Freed by task 135: + kasan_save_stack+0x24/0x50 + kasan_save_track+0x14/0x30 + kasan_save_free_info+0x3a/0x60 + __kasan_slab_free+0x3f/0x50 + kfree+0x137/0x370 + flexcop_device_kfree+0x32/0x50 + pci_device_remove+0xa6/0x1d0 + device_release_driver_internal+0xf8/0x210 + pci_stop_bus_device+0x105/0x150 + pci_stop_and_remove_bus_device_locked+0x15/0x30 + remove_store+0xcc/0xe0 + kernfs_fop_write_iter+0x2c3/0x440 + vfs_write+0x871/0xd70 + ksys_write+0xee/0x1c0 + do_syscall_64+0xac/0x280 + entry_SYSCALL_64_after_hwframe+0x77/0x7f +... + +Replace cancel_delayed_work() with cancel_delayed_work_sync() to ensure +that the delayed work item is properly canceled and any executing delayed +work has finished before the device memory is deallocated. + +This bug was initially identified through static analysis. To reproduce +and test it, I simulated the B2C2 FlexCop PCI device in QEMU and introduced +artificial delays within the flexcop_pci_irq_check_work() function to +increase the likelihood of triggering the bug. + +Fixes: 382c5546d618 ("V4L/DVB (10694): [PATCH] software IRQ watchdog for Flexcop B2C2 DVB PCI cards") +Cc: stable@vger.kernel.org +Signed-off-by: Duoming Zhou +Signed-off-by: Hans Verkuil +Signed-off-by: Greg Kroah-Hartman +--- + drivers/media/pci/b2c2/flexcop-pci.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/media/pci/b2c2/flexcop-pci.c ++++ b/drivers/media/pci/b2c2/flexcop-pci.c +@@ -411,7 +411,7 @@ static void flexcop_pci_remove(struct pc + struct flexcop_pci *fc_pci = pci_get_drvdata(pdev); + + if (irq_chk_intv > 0) +- cancel_delayed_work(&fc_pci->irq_check_work); ++ cancel_delayed_work_sync(&fc_pci->irq_check_work); + + flexcop_pci_dma_exit(fc_pci); + flexcop_device_exit(fc_pci->fc_dev); diff --git a/queue-5.15/media-rc-fix-races-with-imon_disconnect.patch b/queue-5.15/media-rc-fix-races-with-imon_disconnect.patch new file mode 100644 index 0000000000..68a1a46dd2 --- /dev/null +++ b/queue-5.15/media-rc-fix-races-with-imon_disconnect.patch @@ -0,0 +1,160 @@ +From fa0f61cc1d828178aa921475a9b786e7fbb65ccb Mon Sep 17 00:00:00 2001 +From: Larshin Sergey +Date: Tue, 29 Jul 2025 13:13:32 +0300 +Subject: media: rc: fix races with imon_disconnect() + +From: Larshin Sergey + +commit fa0f61cc1d828178aa921475a9b786e7fbb65ccb upstream. + +Syzbot reports a KASAN issue as below: +BUG: KASAN: use-after-free in __create_pipe include/linux/usb.h:1945 [inline] +BUG: KASAN: use-after-free in send_packet+0xa2d/0xbc0 drivers/media/rc/imon.c:627 +Read of size 4 at addr ffff8880256fb000 by task syz-executor314/4465 + +CPU: 2 PID: 4465 Comm: syz-executor314 Not tainted 6.0.0-rc1-syzkaller #0 +Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.14.0-2 04/01/2014 +Call Trace: + +__dump_stack lib/dump_stack.c:88 [inline] +dump_stack_lvl+0xcd/0x134 lib/dump_stack.c:106 +print_address_description mm/kasan/report.c:317 [inline] +print_report.cold+0x2ba/0x6e9 mm/kasan/report.c:433 +kasan_report+0xb1/0x1e0 mm/kasan/report.c:495 +__create_pipe include/linux/usb.h:1945 [inline] +send_packet+0xa2d/0xbc0 drivers/media/rc/imon.c:627 +vfd_write+0x2d9/0x550 drivers/media/rc/imon.c:991 +vfs_write+0x2d7/0xdd0 fs/read_write.c:576 +ksys_write+0x127/0x250 fs/read_write.c:631 +do_syscall_x64 arch/x86/entry/common.c:50 [inline] +do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 +entry_SYSCALL_64_after_hwframe+0x63/0xcd + +The iMON driver improperly releases the usb_device reference in +imon_disconnect without coordinating with active users of the +device. + +Specifically, the fields usbdev_intf0 and usbdev_intf1 are not +protected by the users counter (ictx->users). During probe, +imon_init_intf0 or imon_init_intf1 increments the usb_device +reference count depending on the interface. However, during +disconnect, usb_put_dev is called unconditionally, regardless of +actual usage. + +As a result, if vfd_write or other operations are still in +progress after disconnect, this can lead to a use-after-free of +the usb_device pointer. + +Thread 1 vfd_write Thread 2 imon_disconnect + ... + if + usb_put_dev(ictx->usbdev_intf0) + else + usb_put_dev(ictx->usbdev_intf1) +... +while + send_packet + if + pipe = usb_sndintpipe( + ictx->usbdev_intf0) UAF + else + pipe = usb_sndctrlpipe( + ictx->usbdev_intf0, 0) UAF + +Guard access to usbdev_intf0 and usbdev_intf1 after disconnect by +checking ictx->disconnected in all writer paths. Add early return +with -ENODEV in send_packet(), vfd_write(), lcd_write() and +display_open() if the device is no longer present. + +Set and read ictx->disconnected under ictx->lock to ensure memory +synchronization. Acquire the lock in imon_disconnect() before setting +the flag to synchronize with any ongoing operations. + +Ensure writers exit early and safely after disconnect before the USB +core proceeds with cleanup. + +Found by Linux Verification Center (linuxtesting.org) with Syzkaller. + +Reported-by: syzbot+f1a69784f6efe748c3bf@syzkaller.appspotmail.com +Closes: https://syzkaller.appspot.com/bug?extid=f1a69784f6efe748c3bf +Fixes: 21677cfc562a ("V4L/DVB: ir-core: add imon driver") +Cc: stable@vger.kernel.org + +Signed-off-by: Larshin Sergey +Signed-off-by: Sean Young +Signed-off-by: Hans Verkuil +Signed-off-by: Greg Kroah-Hartman +--- + drivers/media/rc/imon.c | 27 ++++++++++++++++++++------- + 1 file changed, 20 insertions(+), 7 deletions(-) + +--- a/drivers/media/rc/imon.c ++++ b/drivers/media/rc/imon.c +@@ -536,7 +536,9 @@ static int display_open(struct inode *in + + mutex_lock(&ictx->lock); + +- if (!ictx->display_supported) { ++ if (ictx->disconnected) { ++ retval = -ENODEV; ++ } else if (!ictx->display_supported) { + pr_err("display not supported by device\n"); + retval = -ENODEV; + } else if (ictx->display_isopen) { +@@ -598,6 +600,9 @@ static int send_packet(struct imon_conte + int retval = 0; + struct usb_ctrlrequest *control_req = NULL; + ++ if (ictx->disconnected) ++ return -ENODEV; ++ + /* Check if we need to use control or interrupt urb */ + if (!ictx->tx_control) { + pipe = usb_sndintpipe(ictx->usbdev_intf0, +@@ -951,12 +956,14 @@ static ssize_t vfd_write(struct file *fi + static const unsigned char vfd_packet6[] = { + 0x01, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF }; + +- if (ictx->disconnected) +- return -ENODEV; +- + if (mutex_lock_interruptible(&ictx->lock)) + return -ERESTARTSYS; + ++ if (ictx->disconnected) { ++ retval = -ENODEV; ++ goto exit; ++ } ++ + if (!ictx->dev_present_intf0) { + pr_err_ratelimited("no iMON device present\n"); + retval = -ENODEV; +@@ -1031,11 +1038,13 @@ static ssize_t lcd_write(struct file *fi + int retval = 0; + struct imon_context *ictx = file->private_data; + +- if (ictx->disconnected) +- return -ENODEV; +- + mutex_lock(&ictx->lock); + ++ if (ictx->disconnected) { ++ retval = -ENODEV; ++ goto exit; ++ } ++ + if (!ictx->display_supported) { + pr_err_ratelimited("no iMON display present\n"); + retval = -ENODEV; +@@ -2499,7 +2508,11 @@ static void imon_disconnect(struct usb_i + int ifnum; + + ictx = usb_get_intfdata(interface); ++ ++ mutex_lock(&ictx->lock); + ictx->disconnected = true; ++ mutex_unlock(&ictx->lock); ++ + dev = ictx->dev; + ifnum = interface->cur_altsetting->desc.bInterfaceNumber; + diff --git a/queue-5.15/media-uvcvideo-mark-invalid-entities-with-id-uvc_invalid_entity_id.patch b/queue-5.15/media-uvcvideo-mark-invalid-entities-with-id-uvc_invalid_entity_id.patch new file mode 100644 index 0000000000..797e7ff544 --- /dev/null +++ b/queue-5.15/media-uvcvideo-mark-invalid-entities-with-id-uvc_invalid_entity_id.patch @@ -0,0 +1,309 @@ +From 0e2ee70291e64a30fe36960c85294726d34a103e Mon Sep 17 00:00:00 2001 +From: Thadeu Lima de Souza Cascardo +Date: Wed, 20 Aug 2025 16:08:16 +0000 +Subject: media: uvcvideo: Mark invalid entities with id UVC_INVALID_ENTITY_ID + +From: Thadeu Lima de Souza Cascardo + +commit 0e2ee70291e64a30fe36960c85294726d34a103e upstream. + +Per UVC 1.1+ specification 3.7.2, units and terminals must have a non-zero +unique ID. + +``` +Each Unit and Terminal within the video function is assigned a unique +identification number, the Unit ID (UID) or Terminal ID (TID), contained in +the bUnitID or bTerminalID field of the descriptor. The value 0x00 is +reserved for undefined ID, +``` + +If we add a new entity with id 0 or a duplicated ID, it will be marked +as UVC_INVALID_ENTITY_ID. + +In a previous attempt commit 3dd075fe8ebb ("media: uvcvideo: Require +entities to have a non-zero unique ID"), we ignored all the invalid units, +this broke a lot of non-compatible cameras. Hopefully we are more lucky +this time. + +This also prevents some syzkaller reproducers from triggering warnings due +to a chain of entities referring to themselves. In one particular case, an +Output Unit is connected to an Input Unit, both with the same ID of 1. But +when looking up for the source ID of the Output Unit, that same entity is +found instead of the input entity, which leads to such warnings. + +In another case, a backward chain was considered finished as the source ID +was 0. Later on, that entity was found, but its pads were not valid. + +Here is a sample stack trace for one of those cases. + +[ 20.650953] usb 1-1: new high-speed USB device number 2 using dummy_hcd +[ 20.830206] usb 1-1: Using ep0 maxpacket: 8 +[ 20.833501] usb 1-1: config 0 descriptor?? +[ 21.038518] usb 1-1: string descriptor 0 read error: -71 +[ 21.038893] usb 1-1: Found UVC 0.00 device (2833:0201) +[ 21.039299] uvcvideo 1-1:0.0: Entity type for entity Output 1 was not initialized! +[ 21.041583] uvcvideo 1-1:0.0: Entity type for entity Input 1 was not initialized! +[ 21.042218] ------------[ cut here ]------------ +[ 21.042536] WARNING: CPU: 0 PID: 9 at drivers/media/mc/mc-entity.c:1147 media_create_pad_link+0x2c4/0x2e0 +[ 21.043195] Modules linked in: +[ 21.043535] CPU: 0 UID: 0 PID: 9 Comm: kworker/0:1 Not tainted 6.11.0-rc7-00030-g3480e43aeccf #444 +[ 21.044101] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.15.0-1 04/01/2014 +[ 21.044639] Workqueue: usb_hub_wq hub_event +[ 21.045100] RIP: 0010:media_create_pad_link+0x2c4/0x2e0 +[ 21.045508] Code: fe e8 20 01 00 00 b8 f4 ff ff ff 48 83 c4 30 5b 41 5c 41 5d 41 5e 41 5f 5d c3 cc cc cc cc 0f 0b eb e9 0f 0b eb 0a 0f 0b eb 06 <0f> 0b eb 02 0f 0b b8 ea ff ff ff eb d4 66 2e 0f 1f 84 00 00 00 00 +[ 21.046801] RSP: 0018:ffffc9000004b318 EFLAGS: 00010246 +[ 21.047227] RAX: ffff888004e5d458 RBX: 0000000000000000 RCX: ffffffff818fccf1 +[ 21.047719] RDX: 000000000000007b RSI: 0000000000000000 RDI: ffff888004313290 +[ 21.048241] RBP: ffff888004313290 R08: 0001ffffffffffff R09: 0000000000000000 +[ 21.048701] R10: 0000000000000013 R11: 0001888004313290 R12: 0000000000000003 +[ 21.049138] R13: ffff888004313080 R14: ffff888004313080 R15: 0000000000000000 +[ 21.049648] FS: 0000000000000000(0000) GS:ffff88803ec00000(0000) knlGS:0000000000000000 +[ 21.050271] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 +[ 21.050688] CR2: 0000592cc27635b0 CR3: 000000000431c000 CR4: 0000000000750ef0 +[ 21.051136] PKRU: 55555554 +[ 21.051331] Call Trace: +[ 21.051480] +[ 21.051611] ? __warn+0xc4/0x210 +[ 21.051861] ? media_create_pad_link+0x2c4/0x2e0 +[ 21.052252] ? report_bug+0x11b/0x1a0 +[ 21.052540] ? trace_hardirqs_on+0x31/0x40 +[ 21.052901] ? handle_bug+0x3d/0x70 +[ 21.053197] ? exc_invalid_op+0x1a/0x50 +[ 21.053511] ? asm_exc_invalid_op+0x1a/0x20 +[ 21.053924] ? media_create_pad_link+0x91/0x2e0 +[ 21.054364] ? media_create_pad_link+0x2c4/0x2e0 +[ 21.054834] ? media_create_pad_link+0x91/0x2e0 +[ 21.055131] ? _raw_spin_unlock+0x1e/0x40 +[ 21.055441] ? __v4l2_device_register_subdev+0x202/0x210 +[ 21.055837] uvc_mc_register_entities+0x358/0x400 +[ 21.056144] uvc_register_chains+0x1fd/0x290 +[ 21.056413] uvc_probe+0x380e/0x3dc0 +[ 21.056676] ? __lock_acquire+0x5aa/0x26e0 +[ 21.056946] ? find_held_lock+0x33/0xa0 +[ 21.057196] ? kernfs_activate+0x70/0x80 +[ 21.057533] ? usb_match_dynamic_id+0x1b/0x70 +[ 21.057811] ? find_held_lock+0x33/0xa0 +[ 21.058047] ? usb_match_dynamic_id+0x55/0x70 +[ 21.058330] ? lock_release+0x124/0x260 +[ 21.058657] ? usb_match_one_id_intf+0xa2/0x100 +[ 21.058997] usb_probe_interface+0x1ba/0x330 +[ 21.059399] really_probe+0x1ba/0x4c0 +[ 21.059662] __driver_probe_device+0xb2/0x180 +[ 21.059944] driver_probe_device+0x5a/0x100 +[ 21.060170] __device_attach_driver+0xe9/0x160 +[ 21.060427] ? __pfx___device_attach_driver+0x10/0x10 +[ 21.060872] bus_for_each_drv+0xa9/0x100 +[ 21.061312] __device_attach+0xed/0x190 +[ 21.061812] device_initial_probe+0xe/0x20 +[ 21.062229] bus_probe_device+0x4d/0xd0 +[ 21.062590] device_add+0x308/0x590 +[ 21.062912] usb_set_configuration+0x7b6/0xaf0 +[ 21.063403] usb_generic_driver_probe+0x36/0x80 +[ 21.063714] usb_probe_device+0x7b/0x130 +[ 21.063936] really_probe+0x1ba/0x4c0 +[ 21.064111] __driver_probe_device+0xb2/0x180 +[ 21.064577] driver_probe_device+0x5a/0x100 +[ 21.065019] __device_attach_driver+0xe9/0x160 +[ 21.065403] ? __pfx___device_attach_driver+0x10/0x10 +[ 21.065820] bus_for_each_drv+0xa9/0x100 +[ 21.066094] __device_attach+0xed/0x190 +[ 21.066535] device_initial_probe+0xe/0x20 +[ 21.066992] bus_probe_device+0x4d/0xd0 +[ 21.067250] device_add+0x308/0x590 +[ 21.067501] usb_new_device+0x347/0x610 +[ 21.067817] hub_event+0x156b/0x1e30 +[ 21.068060] ? process_scheduled_works+0x48b/0xaf0 +[ 21.068337] process_scheduled_works+0x5a3/0xaf0 +[ 21.068668] worker_thread+0x3cf/0x560 +[ 21.068932] ? kthread+0x109/0x1b0 +[ 21.069133] kthread+0x197/0x1b0 +[ 21.069343] ? __pfx_worker_thread+0x10/0x10 +[ 21.069598] ? __pfx_kthread+0x10/0x10 +[ 21.069908] ret_from_fork+0x32/0x40 +[ 21.070169] ? __pfx_kthread+0x10/0x10 +[ 21.070424] ret_from_fork_asm+0x1a/0x30 +[ 21.070737] + +Reported-by: syzbot+0584f746fde3d52b4675@syzkaller.appspotmail.com +Closes: https://syzkaller.appspot.com/bug?extid=0584f746fde3d52b4675 +Reported-by: syzbot+dd320d114deb3f5bb79b@syzkaller.appspotmail.com +Closes: https://syzkaller.appspot.com/bug?extid=dd320d114deb3f5bb79b +Reported-by: Youngjun Lee +Fixes: a3fbc2e6bb05 ("media: mc-entity.c: use WARN_ON, validate link pads") +Cc: stable@vger.kernel.org +Signed-off-by: Thadeu Lima de Souza Cascardo +Co-developed-by: Ricardo Ribalda +Signed-off-by: Ricardo Ribalda +Reviewed-by: Laurent Pinchart +Reviewed-by: Hans de Goede +Signed-off-by: Hans de Goede +Signed-off-by: Laurent Pinchart +Signed-off-by: Hans Verkuil +Signed-off-by: Greg Kroah-Hartman +--- + drivers/media/usb/uvc/uvc_driver.c | 73 +++++++++++++++++++++++-------------- + drivers/media/usb/uvc/uvcvideo.h | 2 + + 2 files changed, 48 insertions(+), 27 deletions(-) + +--- a/drivers/media/usb/uvc/uvc_driver.c ++++ b/drivers/media/usb/uvc/uvc_driver.c +@@ -413,6 +413,9 @@ struct uvc_entity *uvc_entity_by_id(stru + { + struct uvc_entity *entity; + ++ if (id == UVC_INVALID_ENTITY_ID) ++ return NULL; ++ + list_for_each_entry(entity, &dev->entities, list) { + if (entity->id == id) + return entity; +@@ -1029,14 +1032,27 @@ static const u8 uvc_media_transport_inpu + UVC_GUID_UVC_MEDIA_TRANSPORT_INPUT; + static const u8 uvc_processing_guid[16] = UVC_GUID_UVC_PROCESSING; + +-static struct uvc_entity *uvc_alloc_entity(u16 type, u16 id, +- unsigned int num_pads, unsigned int extra_size) ++static struct uvc_entity *uvc_alloc_new_entity(struct uvc_device *dev, u16 type, ++ u16 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->intf->dev, "Found Unit with invalid ID 0\n"); ++ id = UVC_INVALID_ENTITY_ID; ++ } ++ ++ /* Per UVC 1.1+ spec 3.7.2, the ID is unique. */ ++ if (uvc_entity_by_id(dev, id)) { ++ dev_err(&dev->intf->dev, "Found multiple Units with ID %u\n", id); ++ id = UVC_INVALID_ENTITY_ID; ++ } ++ + extra_size = roundup(extra_size, sizeof(*entity->pads)); + if (num_pads) + num_inputs = type & UVC_TERM_OUTPUT ? num_pads : num_pads - 1; +@@ -1046,7 +1062,7 @@ static struct uvc_entity *uvc_alloc_enti + + num_inputs; + entity = kzalloc(size, GFP_KERNEL); + if (entity == NULL) +- return NULL; ++ return ERR_PTR(-ENOMEM); + + entity->id = id; + entity->type = type; +@@ -1136,10 +1152,10 @@ static int uvc_parse_vendor_control(stru + break; + } + +- unit = uvc_alloc_entity(UVC_VC_EXTENSION_UNIT, buffer[3], +- p + 1, 2*n); +- if (unit == NULL) +- return -ENOMEM; ++ unit = uvc_alloc_new_entity(dev, UVC_VC_EXTENSION_UNIT, ++ buffer[3], p + 1, 2 * n); ++ if (IS_ERR(unit)) ++ return PTR_ERR(unit); + + memcpy(unit->guid, &buffer[4], 16); + unit->extension.bNumControls = buffer[20]; +@@ -1249,10 +1265,10 @@ static int uvc_parse_standard_control(st + return -EINVAL; + } + +- term = uvc_alloc_entity(type | UVC_TERM_INPUT, buffer[3], +- 1, n + p); +- if (term == NULL) +- return -ENOMEM; ++ term = uvc_alloc_new_entity(dev, type | UVC_TERM_INPUT, ++ buffer[3], 1, n + p); ++ if (IS_ERR(term)) ++ return PTR_ERR(term); + + if (UVC_ENTITY_TYPE(term) == UVC_ITT_CAMERA) { + term->camera.bControlSize = n; +@@ -1308,10 +1324,10 @@ static int uvc_parse_standard_control(st + return 0; + } + +- term = uvc_alloc_entity(type | UVC_TERM_OUTPUT, buffer[3], +- 1, 0); +- if (term == NULL) +- return -ENOMEM; ++ term = uvc_alloc_new_entity(dev, type | UVC_TERM_OUTPUT, ++ buffer[3], 1, 0); ++ if (IS_ERR(term)) ++ return PTR_ERR(term); + + memcpy(term->baSourceID, &buffer[7], 1); + +@@ -1332,9 +1348,10 @@ static int uvc_parse_standard_control(st + return -EINVAL; + } + +- unit = uvc_alloc_entity(buffer[2], buffer[3], p + 1, 0); +- if (unit == NULL) +- return -ENOMEM; ++ unit = uvc_alloc_new_entity(dev, buffer[2], buffer[3], ++ p + 1, 0); ++ if (IS_ERR(unit)) ++ return PTR_ERR(unit); + + memcpy(unit->baSourceID, &buffer[5], p); + +@@ -1356,9 +1373,9 @@ static int uvc_parse_standard_control(st + return -EINVAL; + } + +- unit = uvc_alloc_entity(buffer[2], buffer[3], 2, n); +- if (unit == NULL) +- return -ENOMEM; ++ unit = uvc_alloc_new_entity(dev, buffer[2], buffer[3], 2, n); ++ if (IS_ERR(unit)) ++ return PTR_ERR(unit); + + memcpy(unit->baSourceID, &buffer[4], 1); + unit->processing.wMaxMultiplier = +@@ -1387,9 +1404,10 @@ static int uvc_parse_standard_control(st + return -EINVAL; + } + +- unit = uvc_alloc_entity(buffer[2], buffer[3], p + 1, n); +- if (unit == NULL) +- return -ENOMEM; ++ unit = uvc_alloc_new_entity(dev, buffer[2], buffer[3], ++ p + 1, n); ++ if (IS_ERR(unit)) ++ return PTR_ERR(unit); + + memcpy(unit->guid, &buffer[4], 16); + unit->extension.bNumControls = buffer[20]; +@@ -1528,9 +1546,10 @@ static int uvc_gpio_parse(struct uvc_dev + return dev_err_probe(&dev->intf->dev, irq, + "No IRQ for privacy GPIO\n"); + +- unit = uvc_alloc_entity(UVC_EXT_GPIO_UNIT, UVC_EXT_GPIO_UNIT_ID, 0, 1); +- if (!unit) +- return -ENOMEM; ++ unit = uvc_alloc_new_entity(dev, UVC_EXT_GPIO_UNIT, ++ UVC_EXT_GPIO_UNIT_ID, 0, 1); ++ if (IS_ERR(unit)) ++ return PTR_ERR(unit); + + unit->gpio.gpio_privacy = gpio_privacy; + unit->gpio.irq = irq; +--- a/drivers/media/usb/uvc/uvcvideo.h ++++ b/drivers/media/usb/uvc/uvcvideo.h +@@ -41,6 +41,8 @@ + #define UVC_EXT_GPIO_UNIT 0x7ffe + #define UVC_EXT_GPIO_UNIT_ID 0x100 + ++#define UVC_INVALID_ENTITY_ID 0xffff ++ + /* ------------------------------------------------------------------------ + * GUIDs + */ diff --git a/queue-5.15/scsi-target-target_core_configfs-add-length-check-to-avoid-buffer-overflow.patch b/queue-5.15/scsi-target-target_core_configfs-add-length-check-to-avoid-buffer-overflow.patch new file mode 100644 index 0000000000..eac4a91cc5 --- /dev/null +++ b/queue-5.15/scsi-target-target_core_configfs-add-length-check-to-avoid-buffer-overflow.patch @@ -0,0 +1,47 @@ +From 27e06650a5eafe832a90fd2604f0c5e920857fae Mon Sep 17 00:00:00 2001 +From: Wang Haoran +Date: Sat, 20 Sep 2025 15:44:41 +0800 +Subject: scsi: target: target_core_configfs: Add length check to avoid buffer overflow + +From: Wang Haoran + +commit 27e06650a5eafe832a90fd2604f0c5e920857fae upstream. + +A buffer overflow arises from the usage of snprintf to write into the +buffer "buf" in target_lu_gp_members_show function located in +/drivers/target/target_core_configfs.c. This buffer is allocated with +size LU_GROUP_NAME_BUF (256 bytes). + +snprintf(...) formats multiple strings into buf with the HBA name +(hba->hba_group.cg_item), a slash character, a devicename (dev-> +dev_group.cg_item) and a newline character, the total formatted string +length may exceed the buffer size of 256 bytes. + +Since snprintf() returns the total number of bytes that would have been +written (the length of %s/%sn ), this value may exceed the buffer length +(256 bytes) passed to memcpy(), this will ultimately cause function +memcpy reporting a buffer overflow error. + +An additional check of the return value of snprintf() can avoid this +buffer overflow. + +Reported-by: Wang Haoran +Reported-by: ziiiro +Signed-off-by: Wang Haoran +Signed-off-by: Martin K. Petersen +Signed-off-by: Greg Kroah-Hartman +--- + drivers/target/target_core_configfs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/target/target_core_configfs.c ++++ b/drivers/target/target_core_configfs.c +@@ -2679,7 +2679,7 @@ static ssize_t target_lu_gp_members_show + config_item_name(&dev->dev_group.cg_item)); + cur_len++; /* Extra byte for NULL terminator */ + +- if ((cur_len + len) > PAGE_SIZE) { ++ if ((cur_len + len) > PAGE_SIZE || cur_len > LU_GROUP_NAME_BUF) { + pr_warn("Ran out of lu_gp_show_attr" + "_members buffer\n"); + break; diff --git a/queue-5.15/series b/queue-5.15/series new file mode 100644 index 0000000000..e75a3b90f8 --- /dev/null +++ b/queue-5.15/series @@ -0,0 +1,5 @@ +iommu-amd-add-map-unmap_pages-iommu_domain_ops-callback-support.patch +scsi-target-target_core_configfs-add-length-check-to-avoid-buffer-overflow.patch +media-b2c2-fix-use-after-free-causing-by-irq_check_work-in-flexcop_pci_remove.patch +media-rc-fix-races-with-imon_disconnect.patch +media-uvcvideo-mark-invalid-entities-with-id-uvc_invalid_entity_id.patch -- 2.47.3