]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
drop some patches that should wait until 6.1-rc3
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 27 Oct 2022 07:26:29 +0000 (09:26 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 27 Oct 2022 07:26:29 +0000 (09:26 +0200)
queue-5.10/kernfs-fix-use-after-free-in-__kernfs_remove.patch [deleted file]
queue-5.10/series
queue-5.10/usb-add-reset_resume-quirk-for-nvidia-jetson-devices.patch [deleted file]
queue-5.15/kernfs-fix-use-after-free-in-__kernfs_remove.patch [deleted file]
queue-5.15/series
queue-5.15/usb-add-reset_resume-quirk-for-nvidia-jetson-devices.patch [deleted file]
queue-6.0/kernfs-fix-use-after-free-in-__kernfs_remove.patch [deleted file]
queue-6.0/series
queue-6.0/usb-add-reset_resume-quirk-for-nvidia-jetson-devices.patch [deleted file]

diff --git a/queue-5.10/kernfs-fix-use-after-free-in-__kernfs_remove.patch b/queue-5.10/kernfs-fix-use-after-free-in-__kernfs_remove.patch
deleted file mode 100644 (file)
index 0fdf15e..0000000
+++ /dev/null
@@ -1,202 +0,0 @@
-From dcfe8c010accdad535bc505e4f6257168cf5c1f0 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 13 Sep 2022 14:17:23 +0200
-Subject: kernfs: fix use-after-free in __kernfs_remove
-
-From: Christian A. Ehrhardt <lk@c--e.de>
-
-[ Upstream commit 4abc99652812a2ddf932f137515d5c5a04723538 ]
-
-Syzkaller managed to trigger concurrent calls to
-kernfs_remove_by_name_ns() for the same file resulting in
-a KASAN detected use-after-free. The race occurs when the root
-node is freed during kernfs_drain().
-
-To prevent this acquire an additional reference for the root
-of the tree that is removed before calling __kernfs_remove().
-
-Found by syzkaller with the following reproducer (slab_nomerge is
-required):
-
-syz_mount_image$ext4(0x0, &(0x7f0000000100)='./file0\x00', 0x100000, 0x0, 0x0, 0x0, 0x0)
-r0 = openat(0xffffffffffffff9c, &(0x7f0000000080)='/proc/self/exe\x00', 0x0, 0x0)
-close(r0)
-pipe2(&(0x7f0000000140)={0xffffffffffffffff, <r1=>0xffffffffffffffff}, 0x800)
-mount$9p_fd(0x0, &(0x7f0000000040)='./file0\x00', &(0x7f00000000c0), 0x408, &(0x7f0000000280)={'trans=fd,', {'rfdno', 0x3d, r0}, 0x2c, {'wfdno', 0x3d, r1}, 0x2c, {[{@cache_loose}, {@mmap}, {@loose}, {@loose}, {@mmap}], [{@mask={'mask', 0x3d, '^MAY_EXEC'}}, {@fsmagic={'fsmagic', 0x3d, 0x10001}}, {@dont_hash}]}})
-
-Sample report:
-
-==================================================================
-BUG: KASAN: use-after-free in kernfs_type include/linux/kernfs.h:335 [inline]
-BUG: KASAN: use-after-free in kernfs_leftmost_descendant fs/kernfs/dir.c:1261 [inline]
-BUG: KASAN: use-after-free in __kernfs_remove.part.0+0x843/0x960 fs/kernfs/dir.c:1369
-Read of size 2 at addr ffff8880088807f0 by task syz-executor.2/857
-
-CPU: 0 PID: 857 Comm: syz-executor.2 Not tainted 6.0.0-rc3-00363-g7726d4c3e60b #5
-Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.15.0-1 04/01/2014
-Call Trace:
- <TASK>
- __dump_stack lib/dump_stack.c:88 [inline]
- dump_stack_lvl+0x6e/0x91 lib/dump_stack.c:106
- print_address_description mm/kasan/report.c:317 [inline]
- print_report.cold+0x5e/0x5e5 mm/kasan/report.c:433
- kasan_report+0xa3/0x130 mm/kasan/report.c:495
- kernfs_type include/linux/kernfs.h:335 [inline]
- kernfs_leftmost_descendant fs/kernfs/dir.c:1261 [inline]
- __kernfs_remove.part.0+0x843/0x960 fs/kernfs/dir.c:1369
- __kernfs_remove fs/kernfs/dir.c:1356 [inline]
- kernfs_remove_by_name_ns+0x108/0x190 fs/kernfs/dir.c:1589
- sysfs_slab_add+0x133/0x1e0 mm/slub.c:5943
- __kmem_cache_create+0x3e0/0x550 mm/slub.c:4899
- create_cache mm/slab_common.c:229 [inline]
- kmem_cache_create_usercopy+0x167/0x2a0 mm/slab_common.c:335
- p9_client_create+0xd4d/0x1190 net/9p/client.c:993
- v9fs_session_init+0x1e6/0x13c0 fs/9p/v9fs.c:408
- v9fs_mount+0xb9/0xbd0 fs/9p/vfs_super.c:126
- legacy_get_tree+0xf1/0x200 fs/fs_context.c:610
- vfs_get_tree+0x85/0x2e0 fs/super.c:1530
- do_new_mount fs/namespace.c:3040 [inline]
- path_mount+0x675/0x1d00 fs/namespace.c:3370
- do_mount fs/namespace.c:3383 [inline]
- __do_sys_mount fs/namespace.c:3591 [inline]
- __se_sys_mount fs/namespace.c:3568 [inline]
- __x64_sys_mount+0x282/0x300 fs/namespace.c:3568
- do_syscall_x64 arch/x86/entry/common.c:50 [inline]
- do_syscall_64+0x38/0x90 arch/x86/entry/common.c:80
- entry_SYSCALL_64_after_hwframe+0x63/0xcd
-RIP: 0033:0x7f725f983aed
-Code: 02 b8 ff ff ff ff c3 66 0f 1f 44 00 00 f3 0f 1e fa 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 b0 ff ff ff f7 d8 64 89 01 48
-RSP: 002b:00007f725f0f7028 EFLAGS: 00000246 ORIG_RAX: 00000000000000a5
-RAX: ffffffffffffffda RBX: 00007f725faa3f80 RCX: 00007f725f983aed
-RDX: 00000000200000c0 RSI: 0000000020000040 RDI: 0000000000000000
-RBP: 00007f725f9f419c R08: 0000000020000280 R09: 0000000000000000
-R10: 0000000000000408 R11: 0000000000000246 R12: 0000000000000000
-R13: 0000000000000006 R14: 00007f725faa3f80 R15: 00007f725f0d7000
- </TASK>
-
-Allocated by task 855:
- kasan_save_stack+0x1e/0x40 mm/kasan/common.c:38
- kasan_set_track mm/kasan/common.c:45 [inline]
- set_alloc_info mm/kasan/common.c:437 [inline]
- __kasan_slab_alloc+0x66/0x80 mm/kasan/common.c:470
- kasan_slab_alloc include/linux/kasan.h:224 [inline]
- slab_post_alloc_hook mm/slab.h:727 [inline]
- slab_alloc_node mm/slub.c:3243 [inline]
- slab_alloc mm/slub.c:3251 [inline]
- __kmem_cache_alloc_lru mm/slub.c:3258 [inline]
- kmem_cache_alloc+0xbf/0x200 mm/slub.c:3268
- kmem_cache_zalloc include/linux/slab.h:723 [inline]
- __kernfs_new_node+0xd4/0x680 fs/kernfs/dir.c:593
- kernfs_new_node fs/kernfs/dir.c:655 [inline]
- kernfs_create_dir_ns+0x9c/0x220 fs/kernfs/dir.c:1010
- sysfs_create_dir_ns+0x127/0x290 fs/sysfs/dir.c:59
- create_dir lib/kobject.c:63 [inline]
- kobject_add_internal+0x24a/0x8d0 lib/kobject.c:223
- kobject_add_varg lib/kobject.c:358 [inline]
- kobject_init_and_add+0x101/0x160 lib/kobject.c:441
- sysfs_slab_add+0x156/0x1e0 mm/slub.c:5954
- __kmem_cache_create+0x3e0/0x550 mm/slub.c:4899
- create_cache mm/slab_common.c:229 [inline]
- kmem_cache_create_usercopy+0x167/0x2a0 mm/slab_common.c:335
- p9_client_create+0xd4d/0x1190 net/9p/client.c:993
- v9fs_session_init+0x1e6/0x13c0 fs/9p/v9fs.c:408
- v9fs_mount+0xb9/0xbd0 fs/9p/vfs_super.c:126
- legacy_get_tree+0xf1/0x200 fs/fs_context.c:610
- vfs_get_tree+0x85/0x2e0 fs/super.c:1530
- do_new_mount fs/namespace.c:3040 [inline]
- path_mount+0x675/0x1d00 fs/namespace.c:3370
- do_mount fs/namespace.c:3383 [inline]
- __do_sys_mount fs/namespace.c:3591 [inline]
- __se_sys_mount fs/namespace.c:3568 [inline]
- __x64_sys_mount+0x282/0x300 fs/namespace.c:3568
- do_syscall_x64 arch/x86/entry/common.c:50 [inline]
- do_syscall_64+0x38/0x90 arch/x86/entry/common.c:80
- entry_SYSCALL_64_after_hwframe+0x63/0xcd
-
-Freed by task 857:
- kasan_save_stack+0x1e/0x40 mm/kasan/common.c:38
- kasan_set_track+0x21/0x30 mm/kasan/common.c:45
- kasan_set_free_info+0x20/0x40 mm/kasan/generic.c:370
- ____kasan_slab_free mm/kasan/common.c:367 [inline]
- ____kasan_slab_free mm/kasan/common.c:329 [inline]
- __kasan_slab_free+0x108/0x190 mm/kasan/common.c:375
- kasan_slab_free include/linux/kasan.h:200 [inline]
- slab_free_hook mm/slub.c:1754 [inline]
- slab_free_freelist_hook mm/slub.c:1780 [inline]
- slab_free mm/slub.c:3534 [inline]
- kmem_cache_free+0x9c/0x340 mm/slub.c:3551
- kernfs_put.part.0+0x2b2/0x520 fs/kernfs/dir.c:547
- kernfs_put+0x42/0x50 fs/kernfs/dir.c:521
- __kernfs_remove.part.0+0x72d/0x960 fs/kernfs/dir.c:1407
- __kernfs_remove fs/kernfs/dir.c:1356 [inline]
- kernfs_remove_by_name_ns+0x108/0x190 fs/kernfs/dir.c:1589
- sysfs_slab_add+0x133/0x1e0 mm/slub.c:5943
- __kmem_cache_create+0x3e0/0x550 mm/slub.c:4899
- create_cache mm/slab_common.c:229 [inline]
- kmem_cache_create_usercopy+0x167/0x2a0 mm/slab_common.c:335
- p9_client_create+0xd4d/0x1190 net/9p/client.c:993
- v9fs_session_init+0x1e6/0x13c0 fs/9p/v9fs.c:408
- v9fs_mount+0xb9/0xbd0 fs/9p/vfs_super.c:126
- legacy_get_tree+0xf1/0x200 fs/fs_context.c:610
- vfs_get_tree+0x85/0x2e0 fs/super.c:1530
- do_new_mount fs/namespace.c:3040 [inline]
- path_mount+0x675/0x1d00 fs/namespace.c:3370
- do_mount fs/namespace.c:3383 [inline]
- __do_sys_mount fs/namespace.c:3591 [inline]
- __se_sys_mount fs/namespace.c:3568 [inline]
- __x64_sys_mount+0x282/0x300 fs/namespace.c:3568
- do_syscall_x64 arch/x86/entry/common.c:50 [inline]
- do_syscall_64+0x38/0x90 arch/x86/entry/common.c:80
- entry_SYSCALL_64_after_hwframe+0x63/0xcd
-
-The buggy address belongs to the object at ffff888008880780
- which belongs to the cache kernfs_node_cache of size 128
-The buggy address is located 112 bytes inside of
- 128-byte region [ffff888008880780, ffff888008880800)
-
-The buggy address belongs to the physical page:
-page:00000000732833f8 refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x8880
-flags: 0x100000000000200(slab|node=0|zone=1)
-raw: 0100000000000200 0000000000000000 dead000000000122 ffff888001147280
-raw: 0000000000000000 0000000000150015 00000001ffffffff 0000000000000000
-page dumped because: kasan: bad access detected
-
-Memory state around the buggy address:
- ffff888008880680: fc fc fc fc fc fc fc fc fa fb fb fb fb fb fb fb
- ffff888008880700: fb fb fb fb fb fb fb fb fc fc fc fc fc fc fc fc
->ffff888008880780: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
-                                                             ^
- ffff888008880800: fc fc fc fc fc fc fc fc fa fb fb fb fb fb fb fb
- ffff888008880880: fb fb fb fb fb fb fb fb fc fc fc fc fc fc fc fc
-==================================================================
-
-Acked-by: Tejun Heo <tj@kernel.org>
-Cc: stable <stable@kernel.org> # -rc3
-Signed-off-by: Christian A. Ehrhardt <lk@c--e.de>
-Link: https://lore.kernel.org/r/20220913121723.691454-1-lk@c--e.de
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- fs/kernfs/dir.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
-index afb39e1bbe3b..8b3c86a502da 100644
---- a/fs/kernfs/dir.c
-+++ b/fs/kernfs/dir.c
-@@ -1519,8 +1519,11 @@ int kernfs_remove_by_name_ns(struct kernfs_node *parent, const char *name,
-       mutex_lock(&kernfs_mutex);
-       kn = kernfs_find_ns(parent, name, ns);
--      if (kn)
-+      if (kn) {
-+              kernfs_get(kn);
-               __kernfs_remove(kn);
-+              kernfs_put(kn);
-+      }
-       mutex_unlock(&kernfs_mutex);
--- 
-2.35.1
-
index 01f84e08a2eb9c4d5252ef6c7dbec243290947cc..8406d45eebed10d957a31f5d06549266c5d571b9 100644 (file)
@@ -56,8 +56,6 @@ iommu-vt-d-clean-up-si_domain-in-the-init_dmars-erro.patch
 drm-virtio-use-appropriate-atomic-state-in-virtio_gp.patch
 crypto-qat-reduce-size-of-mapped-region.patch
 revert-crypto-qat-reduce-size-of-mapped-region.patch
-usb-add-reset_resume-quirk-for-nvidia-jetson-devices.patch
-kernfs-fix-use-after-free-in-__kernfs_remove.patch
 sunrpc-add-xdr_set_scratch_page-and-xdr_reset_scratc.patch
 sunrpc-prepare-for-xdr_stream-style-decoding-on-the-.patch
 nfsd-add-common-helpers-to-decode-void-args-and-enco.patch
diff --git a/queue-5.10/usb-add-reset_resume-quirk-for-nvidia-jetson-devices.patch b/queue-5.10/usb-add-reset_resume-quirk-for-nvidia-jetson-devices.patch
deleted file mode 100644 (file)
index 1e6f505..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-From 15bd6fce2c8be3bc43ba3d6e682eb958e2ad5800 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 19 Sep 2022 20:16:10 +0300
-Subject: USB: add RESET_RESUME quirk for NVIDIA Jetson devices in RCM
-
-From: Hannu Hartikainen <hannu@hrtk.in>
-
-[ Upstream commit fc4ade55c617dc73c7e9756b57f3230b4ff24540 ]
-
-NVIDIA Jetson devices in Force Recovery mode (RCM) do not support
-suspending, ie. flashing fails if the device has been suspended. The
-devices are still visible in lsusb and seem to work otherwise, making
-the issue hard to debug. This has been discovered in various forum
-posts, eg. [1].
-
-The patch has been tested on NVIDIA Jetson AGX Xavier, but I'm adding
-all the Jetson models listed in [2] on the assumption that they all
-behave similarly.
-
-[1]: https://forums.developer.nvidia.com/t/flashing-not-working/72365
-[2]: https://docs.nvidia.com/jetson/archives/l4t-archived/l4t-3271/index.html#page/Tegra%20Linux%20Driver%20Package%20Development%20Guide/quick_start.html
-
-Signed-off-by: Hannu Hartikainen <hannu@hrtk.in>
-Cc: stable <stable@kernel.org>  # after 6.1-rc3
-Link: https://lore.kernel.org/r/20220919171610.30484-1-hannu@hrtk.in
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/usb/core/quirks.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
-index 03473e20e218..eb3ea45d5d13 100644
---- a/drivers/usb/core/quirks.c
-+++ b/drivers/usb/core/quirks.c
-@@ -388,6 +388,15 @@ static const struct usb_device_id usb_quirk_list[] = {
-       /* Kingston DataTraveler 3.0 */
-       { USB_DEVICE(0x0951, 0x1666), .driver_info = USB_QUIRK_NO_LPM },
-+      /* NVIDIA Jetson devices in Force Recovery mode */
-+      { USB_DEVICE(0x0955, 0x7018), .driver_info = USB_QUIRK_RESET_RESUME },
-+      { USB_DEVICE(0x0955, 0x7019), .driver_info = USB_QUIRK_RESET_RESUME },
-+      { USB_DEVICE(0x0955, 0x7418), .driver_info = USB_QUIRK_RESET_RESUME },
-+      { USB_DEVICE(0x0955, 0x7721), .driver_info = USB_QUIRK_RESET_RESUME },
-+      { USB_DEVICE(0x0955, 0x7c18), .driver_info = USB_QUIRK_RESET_RESUME },
-+      { USB_DEVICE(0x0955, 0x7e19), .driver_info = USB_QUIRK_RESET_RESUME },
-+      { USB_DEVICE(0x0955, 0x7f21), .driver_info = USB_QUIRK_RESET_RESUME },
-+
-       /* X-Rite/Gretag-Macbeth Eye-One Pro display colorimeter */
-       { USB_DEVICE(0x0971, 0x2000), .driver_info = USB_QUIRK_NO_SET_INTF },
--- 
-2.35.1
-
diff --git a/queue-5.15/kernfs-fix-use-after-free-in-__kernfs_remove.patch b/queue-5.15/kernfs-fix-use-after-free-in-__kernfs_remove.patch
deleted file mode 100644 (file)
index 0e66e66..0000000
+++ /dev/null
@@ -1,202 +0,0 @@
-From 6709ef0f416b63f2565a5fc702f7b2049e5cc023 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 13 Sep 2022 14:17:23 +0200
-Subject: kernfs: fix use-after-free in __kernfs_remove
-
-From: Christian A. Ehrhardt <lk@c--e.de>
-
-[ Upstream commit 4abc99652812a2ddf932f137515d5c5a04723538 ]
-
-Syzkaller managed to trigger concurrent calls to
-kernfs_remove_by_name_ns() for the same file resulting in
-a KASAN detected use-after-free. The race occurs when the root
-node is freed during kernfs_drain().
-
-To prevent this acquire an additional reference for the root
-of the tree that is removed before calling __kernfs_remove().
-
-Found by syzkaller with the following reproducer (slab_nomerge is
-required):
-
-syz_mount_image$ext4(0x0, &(0x7f0000000100)='./file0\x00', 0x100000, 0x0, 0x0, 0x0, 0x0)
-r0 = openat(0xffffffffffffff9c, &(0x7f0000000080)='/proc/self/exe\x00', 0x0, 0x0)
-close(r0)
-pipe2(&(0x7f0000000140)={0xffffffffffffffff, <r1=>0xffffffffffffffff}, 0x800)
-mount$9p_fd(0x0, &(0x7f0000000040)='./file0\x00', &(0x7f00000000c0), 0x408, &(0x7f0000000280)={'trans=fd,', {'rfdno', 0x3d, r0}, 0x2c, {'wfdno', 0x3d, r1}, 0x2c, {[{@cache_loose}, {@mmap}, {@loose}, {@loose}, {@mmap}], [{@mask={'mask', 0x3d, '^MAY_EXEC'}}, {@fsmagic={'fsmagic', 0x3d, 0x10001}}, {@dont_hash}]}})
-
-Sample report:
-
-==================================================================
-BUG: KASAN: use-after-free in kernfs_type include/linux/kernfs.h:335 [inline]
-BUG: KASAN: use-after-free in kernfs_leftmost_descendant fs/kernfs/dir.c:1261 [inline]
-BUG: KASAN: use-after-free in __kernfs_remove.part.0+0x843/0x960 fs/kernfs/dir.c:1369
-Read of size 2 at addr ffff8880088807f0 by task syz-executor.2/857
-
-CPU: 0 PID: 857 Comm: syz-executor.2 Not tainted 6.0.0-rc3-00363-g7726d4c3e60b #5
-Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.15.0-1 04/01/2014
-Call Trace:
- <TASK>
- __dump_stack lib/dump_stack.c:88 [inline]
- dump_stack_lvl+0x6e/0x91 lib/dump_stack.c:106
- print_address_description mm/kasan/report.c:317 [inline]
- print_report.cold+0x5e/0x5e5 mm/kasan/report.c:433
- kasan_report+0xa3/0x130 mm/kasan/report.c:495
- kernfs_type include/linux/kernfs.h:335 [inline]
- kernfs_leftmost_descendant fs/kernfs/dir.c:1261 [inline]
- __kernfs_remove.part.0+0x843/0x960 fs/kernfs/dir.c:1369
- __kernfs_remove fs/kernfs/dir.c:1356 [inline]
- kernfs_remove_by_name_ns+0x108/0x190 fs/kernfs/dir.c:1589
- sysfs_slab_add+0x133/0x1e0 mm/slub.c:5943
- __kmem_cache_create+0x3e0/0x550 mm/slub.c:4899
- create_cache mm/slab_common.c:229 [inline]
- kmem_cache_create_usercopy+0x167/0x2a0 mm/slab_common.c:335
- p9_client_create+0xd4d/0x1190 net/9p/client.c:993
- v9fs_session_init+0x1e6/0x13c0 fs/9p/v9fs.c:408
- v9fs_mount+0xb9/0xbd0 fs/9p/vfs_super.c:126
- legacy_get_tree+0xf1/0x200 fs/fs_context.c:610
- vfs_get_tree+0x85/0x2e0 fs/super.c:1530
- do_new_mount fs/namespace.c:3040 [inline]
- path_mount+0x675/0x1d00 fs/namespace.c:3370
- do_mount fs/namespace.c:3383 [inline]
- __do_sys_mount fs/namespace.c:3591 [inline]
- __se_sys_mount fs/namespace.c:3568 [inline]
- __x64_sys_mount+0x282/0x300 fs/namespace.c:3568
- do_syscall_x64 arch/x86/entry/common.c:50 [inline]
- do_syscall_64+0x38/0x90 arch/x86/entry/common.c:80
- entry_SYSCALL_64_after_hwframe+0x63/0xcd
-RIP: 0033:0x7f725f983aed
-Code: 02 b8 ff ff ff ff c3 66 0f 1f 44 00 00 f3 0f 1e fa 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 b0 ff ff ff f7 d8 64 89 01 48
-RSP: 002b:00007f725f0f7028 EFLAGS: 00000246 ORIG_RAX: 00000000000000a5
-RAX: ffffffffffffffda RBX: 00007f725faa3f80 RCX: 00007f725f983aed
-RDX: 00000000200000c0 RSI: 0000000020000040 RDI: 0000000000000000
-RBP: 00007f725f9f419c R08: 0000000020000280 R09: 0000000000000000
-R10: 0000000000000408 R11: 0000000000000246 R12: 0000000000000000
-R13: 0000000000000006 R14: 00007f725faa3f80 R15: 00007f725f0d7000
- </TASK>
-
-Allocated by task 855:
- kasan_save_stack+0x1e/0x40 mm/kasan/common.c:38
- kasan_set_track mm/kasan/common.c:45 [inline]
- set_alloc_info mm/kasan/common.c:437 [inline]
- __kasan_slab_alloc+0x66/0x80 mm/kasan/common.c:470
- kasan_slab_alloc include/linux/kasan.h:224 [inline]
- slab_post_alloc_hook mm/slab.h:727 [inline]
- slab_alloc_node mm/slub.c:3243 [inline]
- slab_alloc mm/slub.c:3251 [inline]
- __kmem_cache_alloc_lru mm/slub.c:3258 [inline]
- kmem_cache_alloc+0xbf/0x200 mm/slub.c:3268
- kmem_cache_zalloc include/linux/slab.h:723 [inline]
- __kernfs_new_node+0xd4/0x680 fs/kernfs/dir.c:593
- kernfs_new_node fs/kernfs/dir.c:655 [inline]
- kernfs_create_dir_ns+0x9c/0x220 fs/kernfs/dir.c:1010
- sysfs_create_dir_ns+0x127/0x290 fs/sysfs/dir.c:59
- create_dir lib/kobject.c:63 [inline]
- kobject_add_internal+0x24a/0x8d0 lib/kobject.c:223
- kobject_add_varg lib/kobject.c:358 [inline]
- kobject_init_and_add+0x101/0x160 lib/kobject.c:441
- sysfs_slab_add+0x156/0x1e0 mm/slub.c:5954
- __kmem_cache_create+0x3e0/0x550 mm/slub.c:4899
- create_cache mm/slab_common.c:229 [inline]
- kmem_cache_create_usercopy+0x167/0x2a0 mm/slab_common.c:335
- p9_client_create+0xd4d/0x1190 net/9p/client.c:993
- v9fs_session_init+0x1e6/0x13c0 fs/9p/v9fs.c:408
- v9fs_mount+0xb9/0xbd0 fs/9p/vfs_super.c:126
- legacy_get_tree+0xf1/0x200 fs/fs_context.c:610
- vfs_get_tree+0x85/0x2e0 fs/super.c:1530
- do_new_mount fs/namespace.c:3040 [inline]
- path_mount+0x675/0x1d00 fs/namespace.c:3370
- do_mount fs/namespace.c:3383 [inline]
- __do_sys_mount fs/namespace.c:3591 [inline]
- __se_sys_mount fs/namespace.c:3568 [inline]
- __x64_sys_mount+0x282/0x300 fs/namespace.c:3568
- do_syscall_x64 arch/x86/entry/common.c:50 [inline]
- do_syscall_64+0x38/0x90 arch/x86/entry/common.c:80
- entry_SYSCALL_64_after_hwframe+0x63/0xcd
-
-Freed by task 857:
- kasan_save_stack+0x1e/0x40 mm/kasan/common.c:38
- kasan_set_track+0x21/0x30 mm/kasan/common.c:45
- kasan_set_free_info+0x20/0x40 mm/kasan/generic.c:370
- ____kasan_slab_free mm/kasan/common.c:367 [inline]
- ____kasan_slab_free mm/kasan/common.c:329 [inline]
- __kasan_slab_free+0x108/0x190 mm/kasan/common.c:375
- kasan_slab_free include/linux/kasan.h:200 [inline]
- slab_free_hook mm/slub.c:1754 [inline]
- slab_free_freelist_hook mm/slub.c:1780 [inline]
- slab_free mm/slub.c:3534 [inline]
- kmem_cache_free+0x9c/0x340 mm/slub.c:3551
- kernfs_put.part.0+0x2b2/0x520 fs/kernfs/dir.c:547
- kernfs_put+0x42/0x50 fs/kernfs/dir.c:521
- __kernfs_remove.part.0+0x72d/0x960 fs/kernfs/dir.c:1407
- __kernfs_remove fs/kernfs/dir.c:1356 [inline]
- kernfs_remove_by_name_ns+0x108/0x190 fs/kernfs/dir.c:1589
- sysfs_slab_add+0x133/0x1e0 mm/slub.c:5943
- __kmem_cache_create+0x3e0/0x550 mm/slub.c:4899
- create_cache mm/slab_common.c:229 [inline]
- kmem_cache_create_usercopy+0x167/0x2a0 mm/slab_common.c:335
- p9_client_create+0xd4d/0x1190 net/9p/client.c:993
- v9fs_session_init+0x1e6/0x13c0 fs/9p/v9fs.c:408
- v9fs_mount+0xb9/0xbd0 fs/9p/vfs_super.c:126
- legacy_get_tree+0xf1/0x200 fs/fs_context.c:610
- vfs_get_tree+0x85/0x2e0 fs/super.c:1530
- do_new_mount fs/namespace.c:3040 [inline]
- path_mount+0x675/0x1d00 fs/namespace.c:3370
- do_mount fs/namespace.c:3383 [inline]
- __do_sys_mount fs/namespace.c:3591 [inline]
- __se_sys_mount fs/namespace.c:3568 [inline]
- __x64_sys_mount+0x282/0x300 fs/namespace.c:3568
- do_syscall_x64 arch/x86/entry/common.c:50 [inline]
- do_syscall_64+0x38/0x90 arch/x86/entry/common.c:80
- entry_SYSCALL_64_after_hwframe+0x63/0xcd
-
-The buggy address belongs to the object at ffff888008880780
- which belongs to the cache kernfs_node_cache of size 128
-The buggy address is located 112 bytes inside of
- 128-byte region [ffff888008880780, ffff888008880800)
-
-The buggy address belongs to the physical page:
-page:00000000732833f8 refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x8880
-flags: 0x100000000000200(slab|node=0|zone=1)
-raw: 0100000000000200 0000000000000000 dead000000000122 ffff888001147280
-raw: 0000000000000000 0000000000150015 00000001ffffffff 0000000000000000
-page dumped because: kasan: bad access detected
-
-Memory state around the buggy address:
- ffff888008880680: fc fc fc fc fc fc fc fc fa fb fb fb fb fb fb fb
- ffff888008880700: fb fb fb fb fb fb fb fb fc fc fc fc fc fc fc fc
->ffff888008880780: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
-                                                             ^
- ffff888008880800: fc fc fc fc fc fc fc fc fa fb fb fb fb fb fb fb
- ffff888008880880: fb fb fb fb fb fb fb fb fc fc fc fc fc fc fc fc
-==================================================================
-
-Acked-by: Tejun Heo <tj@kernel.org>
-Cc: stable <stable@kernel.org> # -rc3
-Signed-off-by: Christian A. Ehrhardt <lk@c--e.de>
-Link: https://lore.kernel.org/r/20220913121723.691454-1-lk@c--e.de
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- fs/kernfs/dir.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
-index 7bf1d5fc2e9c..90677cfbcf9c 100644
---- a/fs/kernfs/dir.c
-+++ b/fs/kernfs/dir.c
-@@ -1547,8 +1547,11 @@ int kernfs_remove_by_name_ns(struct kernfs_node *parent, const char *name,
-       down_write(&kernfs_rwsem);
-       kn = kernfs_find_ns(parent, name, ns);
--      if (kn)
-+      if (kn) {
-+              kernfs_get(kn);
-               __kernfs_remove(kn);
-+              kernfs_put(kn);
-+      }
-       up_write(&kernfs_rwsem);
--- 
-2.35.1
-
index b1f04501d510d51b0b51c4a861b9e3608c504d73..8c5d62f8cad20463a5d804ce07b8d82d907f1061 100644 (file)
@@ -72,14 +72,12 @@ fs-dlm-fix-invalid-derefence-of-sb_lvbptr.patch
 scsi-lpfc-adjust-bytes-received-vales-during-cmf-tim.patch
 scsi-lpfc-adjust-cmf-total-bytes-and-rxmonitor.patch
 scsi-lpfc-rework-mib-rx-monitor-debug-info-logic.patch
-usb-add-reset_resume-quirk-for-nvidia-jetson-devices.patch
 serial-stm32-re-introduce-an-irq-flag-condition-in-u.patch
 serial-stm32-rework-rx-over-dma.patch
 serial-stm32-factor-out-gpio-rts-toggling-into-separ.patch
 serial-stm32-use-tc-interrupt-to-deassert-gpio-rts-i.patch
 serial-stm32-deassert-transmit-enable-on-rs485_confi.patch
 arm64-mte-move-register-initialization-to-c.patch
-kernfs-fix-use-after-free-in-__kernfs_remove.patch
 btrfs-rename-root-fields-in-delayed-refs-structs.patch
 btrfs-pull-up-qgroup-checks-from-delayed-ref-core-to.patch
 ksmbd-handle-smb2-query-dir-request-for-outputbuffer.patch
diff --git a/queue-5.15/usb-add-reset_resume-quirk-for-nvidia-jetson-devices.patch b/queue-5.15/usb-add-reset_resume-quirk-for-nvidia-jetson-devices.patch
deleted file mode 100644 (file)
index 1883cc5..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-From 854c1c2b871ac10afc8e370f4fec71125a956db4 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 19 Sep 2022 20:16:10 +0300
-Subject: USB: add RESET_RESUME quirk for NVIDIA Jetson devices in RCM
-
-From: Hannu Hartikainen <hannu@hrtk.in>
-
-[ Upstream commit fc4ade55c617dc73c7e9756b57f3230b4ff24540 ]
-
-NVIDIA Jetson devices in Force Recovery mode (RCM) do not support
-suspending, ie. flashing fails if the device has been suspended. The
-devices are still visible in lsusb and seem to work otherwise, making
-the issue hard to debug. This has been discovered in various forum
-posts, eg. [1].
-
-The patch has been tested on NVIDIA Jetson AGX Xavier, but I'm adding
-all the Jetson models listed in [2] on the assumption that they all
-behave similarly.
-
-[1]: https://forums.developer.nvidia.com/t/flashing-not-working/72365
-[2]: https://docs.nvidia.com/jetson/archives/l4t-archived/l4t-3271/index.html#page/Tegra%20Linux%20Driver%20Package%20Development%20Guide/quick_start.html
-
-Signed-off-by: Hannu Hartikainen <hannu@hrtk.in>
-Cc: stable <stable@kernel.org>  # after 6.1-rc3
-Link: https://lore.kernel.org/r/20220919171610.30484-1-hannu@hrtk.in
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/usb/core/quirks.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
-index 999b7c9697fc..0722d2131305 100644
---- a/drivers/usb/core/quirks.c
-+++ b/drivers/usb/core/quirks.c
-@@ -388,6 +388,15 @@ static const struct usb_device_id usb_quirk_list[] = {
-       /* Kingston DataTraveler 3.0 */
-       { USB_DEVICE(0x0951, 0x1666), .driver_info = USB_QUIRK_NO_LPM },
-+      /* NVIDIA Jetson devices in Force Recovery mode */
-+      { USB_DEVICE(0x0955, 0x7018), .driver_info = USB_QUIRK_RESET_RESUME },
-+      { USB_DEVICE(0x0955, 0x7019), .driver_info = USB_QUIRK_RESET_RESUME },
-+      { USB_DEVICE(0x0955, 0x7418), .driver_info = USB_QUIRK_RESET_RESUME },
-+      { USB_DEVICE(0x0955, 0x7721), .driver_info = USB_QUIRK_RESET_RESUME },
-+      { USB_DEVICE(0x0955, 0x7c18), .driver_info = USB_QUIRK_RESET_RESUME },
-+      { USB_DEVICE(0x0955, 0x7e19), .driver_info = USB_QUIRK_RESET_RESUME },
-+      { USB_DEVICE(0x0955, 0x7f21), .driver_info = USB_QUIRK_RESET_RESUME },
-+
-       /* X-Rite/Gretag-Macbeth Eye-One Pro display colorimeter */
-       { USB_DEVICE(0x0971, 0x2000), .driver_info = USB_QUIRK_NO_SET_INTF },
--- 
-2.35.1
-
diff --git a/queue-6.0/kernfs-fix-use-after-free-in-__kernfs_remove.patch b/queue-6.0/kernfs-fix-use-after-free-in-__kernfs_remove.patch
deleted file mode 100644 (file)
index 03f9eaa..0000000
+++ /dev/null
@@ -1,202 +0,0 @@
-From 53a6798496cd9ca4a589646c7f8f44224a018c9e Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 13 Sep 2022 14:17:23 +0200
-Subject: kernfs: fix use-after-free in __kernfs_remove
-
-From: Christian A. Ehrhardt <lk@c--e.de>
-
-[ Upstream commit 4abc99652812a2ddf932f137515d5c5a04723538 ]
-
-Syzkaller managed to trigger concurrent calls to
-kernfs_remove_by_name_ns() for the same file resulting in
-a KASAN detected use-after-free. The race occurs when the root
-node is freed during kernfs_drain().
-
-To prevent this acquire an additional reference for the root
-of the tree that is removed before calling __kernfs_remove().
-
-Found by syzkaller with the following reproducer (slab_nomerge is
-required):
-
-syz_mount_image$ext4(0x0, &(0x7f0000000100)='./file0\x00', 0x100000, 0x0, 0x0, 0x0, 0x0)
-r0 = openat(0xffffffffffffff9c, &(0x7f0000000080)='/proc/self/exe\x00', 0x0, 0x0)
-close(r0)
-pipe2(&(0x7f0000000140)={0xffffffffffffffff, <r1=>0xffffffffffffffff}, 0x800)
-mount$9p_fd(0x0, &(0x7f0000000040)='./file0\x00', &(0x7f00000000c0), 0x408, &(0x7f0000000280)={'trans=fd,', {'rfdno', 0x3d, r0}, 0x2c, {'wfdno', 0x3d, r1}, 0x2c, {[{@cache_loose}, {@mmap}, {@loose}, {@loose}, {@mmap}], [{@mask={'mask', 0x3d, '^MAY_EXEC'}}, {@fsmagic={'fsmagic', 0x3d, 0x10001}}, {@dont_hash}]}})
-
-Sample report:
-
-==================================================================
-BUG: KASAN: use-after-free in kernfs_type include/linux/kernfs.h:335 [inline]
-BUG: KASAN: use-after-free in kernfs_leftmost_descendant fs/kernfs/dir.c:1261 [inline]
-BUG: KASAN: use-after-free in __kernfs_remove.part.0+0x843/0x960 fs/kernfs/dir.c:1369
-Read of size 2 at addr ffff8880088807f0 by task syz-executor.2/857
-
-CPU: 0 PID: 857 Comm: syz-executor.2 Not tainted 6.0.0-rc3-00363-g7726d4c3e60b #5
-Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.15.0-1 04/01/2014
-Call Trace:
- <TASK>
- __dump_stack lib/dump_stack.c:88 [inline]
- dump_stack_lvl+0x6e/0x91 lib/dump_stack.c:106
- print_address_description mm/kasan/report.c:317 [inline]
- print_report.cold+0x5e/0x5e5 mm/kasan/report.c:433
- kasan_report+0xa3/0x130 mm/kasan/report.c:495
- kernfs_type include/linux/kernfs.h:335 [inline]
- kernfs_leftmost_descendant fs/kernfs/dir.c:1261 [inline]
- __kernfs_remove.part.0+0x843/0x960 fs/kernfs/dir.c:1369
- __kernfs_remove fs/kernfs/dir.c:1356 [inline]
- kernfs_remove_by_name_ns+0x108/0x190 fs/kernfs/dir.c:1589
- sysfs_slab_add+0x133/0x1e0 mm/slub.c:5943
- __kmem_cache_create+0x3e0/0x550 mm/slub.c:4899
- create_cache mm/slab_common.c:229 [inline]
- kmem_cache_create_usercopy+0x167/0x2a0 mm/slab_common.c:335
- p9_client_create+0xd4d/0x1190 net/9p/client.c:993
- v9fs_session_init+0x1e6/0x13c0 fs/9p/v9fs.c:408
- v9fs_mount+0xb9/0xbd0 fs/9p/vfs_super.c:126
- legacy_get_tree+0xf1/0x200 fs/fs_context.c:610
- vfs_get_tree+0x85/0x2e0 fs/super.c:1530
- do_new_mount fs/namespace.c:3040 [inline]
- path_mount+0x675/0x1d00 fs/namespace.c:3370
- do_mount fs/namespace.c:3383 [inline]
- __do_sys_mount fs/namespace.c:3591 [inline]
- __se_sys_mount fs/namespace.c:3568 [inline]
- __x64_sys_mount+0x282/0x300 fs/namespace.c:3568
- do_syscall_x64 arch/x86/entry/common.c:50 [inline]
- do_syscall_64+0x38/0x90 arch/x86/entry/common.c:80
- entry_SYSCALL_64_after_hwframe+0x63/0xcd
-RIP: 0033:0x7f725f983aed
-Code: 02 b8 ff ff ff ff c3 66 0f 1f 44 00 00 f3 0f 1e fa 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 b0 ff ff ff f7 d8 64 89 01 48
-RSP: 002b:00007f725f0f7028 EFLAGS: 00000246 ORIG_RAX: 00000000000000a5
-RAX: ffffffffffffffda RBX: 00007f725faa3f80 RCX: 00007f725f983aed
-RDX: 00000000200000c0 RSI: 0000000020000040 RDI: 0000000000000000
-RBP: 00007f725f9f419c R08: 0000000020000280 R09: 0000000000000000
-R10: 0000000000000408 R11: 0000000000000246 R12: 0000000000000000
-R13: 0000000000000006 R14: 00007f725faa3f80 R15: 00007f725f0d7000
- </TASK>
-
-Allocated by task 855:
- kasan_save_stack+0x1e/0x40 mm/kasan/common.c:38
- kasan_set_track mm/kasan/common.c:45 [inline]
- set_alloc_info mm/kasan/common.c:437 [inline]
- __kasan_slab_alloc+0x66/0x80 mm/kasan/common.c:470
- kasan_slab_alloc include/linux/kasan.h:224 [inline]
- slab_post_alloc_hook mm/slab.h:727 [inline]
- slab_alloc_node mm/slub.c:3243 [inline]
- slab_alloc mm/slub.c:3251 [inline]
- __kmem_cache_alloc_lru mm/slub.c:3258 [inline]
- kmem_cache_alloc+0xbf/0x200 mm/slub.c:3268
- kmem_cache_zalloc include/linux/slab.h:723 [inline]
- __kernfs_new_node+0xd4/0x680 fs/kernfs/dir.c:593
- kernfs_new_node fs/kernfs/dir.c:655 [inline]
- kernfs_create_dir_ns+0x9c/0x220 fs/kernfs/dir.c:1010
- sysfs_create_dir_ns+0x127/0x290 fs/sysfs/dir.c:59
- create_dir lib/kobject.c:63 [inline]
- kobject_add_internal+0x24a/0x8d0 lib/kobject.c:223
- kobject_add_varg lib/kobject.c:358 [inline]
- kobject_init_and_add+0x101/0x160 lib/kobject.c:441
- sysfs_slab_add+0x156/0x1e0 mm/slub.c:5954
- __kmem_cache_create+0x3e0/0x550 mm/slub.c:4899
- create_cache mm/slab_common.c:229 [inline]
- kmem_cache_create_usercopy+0x167/0x2a0 mm/slab_common.c:335
- p9_client_create+0xd4d/0x1190 net/9p/client.c:993
- v9fs_session_init+0x1e6/0x13c0 fs/9p/v9fs.c:408
- v9fs_mount+0xb9/0xbd0 fs/9p/vfs_super.c:126
- legacy_get_tree+0xf1/0x200 fs/fs_context.c:610
- vfs_get_tree+0x85/0x2e0 fs/super.c:1530
- do_new_mount fs/namespace.c:3040 [inline]
- path_mount+0x675/0x1d00 fs/namespace.c:3370
- do_mount fs/namespace.c:3383 [inline]
- __do_sys_mount fs/namespace.c:3591 [inline]
- __se_sys_mount fs/namespace.c:3568 [inline]
- __x64_sys_mount+0x282/0x300 fs/namespace.c:3568
- do_syscall_x64 arch/x86/entry/common.c:50 [inline]
- do_syscall_64+0x38/0x90 arch/x86/entry/common.c:80
- entry_SYSCALL_64_after_hwframe+0x63/0xcd
-
-Freed by task 857:
- kasan_save_stack+0x1e/0x40 mm/kasan/common.c:38
- kasan_set_track+0x21/0x30 mm/kasan/common.c:45
- kasan_set_free_info+0x20/0x40 mm/kasan/generic.c:370
- ____kasan_slab_free mm/kasan/common.c:367 [inline]
- ____kasan_slab_free mm/kasan/common.c:329 [inline]
- __kasan_slab_free+0x108/0x190 mm/kasan/common.c:375
- kasan_slab_free include/linux/kasan.h:200 [inline]
- slab_free_hook mm/slub.c:1754 [inline]
- slab_free_freelist_hook mm/slub.c:1780 [inline]
- slab_free mm/slub.c:3534 [inline]
- kmem_cache_free+0x9c/0x340 mm/slub.c:3551
- kernfs_put.part.0+0x2b2/0x520 fs/kernfs/dir.c:547
- kernfs_put+0x42/0x50 fs/kernfs/dir.c:521
- __kernfs_remove.part.0+0x72d/0x960 fs/kernfs/dir.c:1407
- __kernfs_remove fs/kernfs/dir.c:1356 [inline]
- kernfs_remove_by_name_ns+0x108/0x190 fs/kernfs/dir.c:1589
- sysfs_slab_add+0x133/0x1e0 mm/slub.c:5943
- __kmem_cache_create+0x3e0/0x550 mm/slub.c:4899
- create_cache mm/slab_common.c:229 [inline]
- kmem_cache_create_usercopy+0x167/0x2a0 mm/slab_common.c:335
- p9_client_create+0xd4d/0x1190 net/9p/client.c:993
- v9fs_session_init+0x1e6/0x13c0 fs/9p/v9fs.c:408
- v9fs_mount+0xb9/0xbd0 fs/9p/vfs_super.c:126
- legacy_get_tree+0xf1/0x200 fs/fs_context.c:610
- vfs_get_tree+0x85/0x2e0 fs/super.c:1530
- do_new_mount fs/namespace.c:3040 [inline]
- path_mount+0x675/0x1d00 fs/namespace.c:3370
- do_mount fs/namespace.c:3383 [inline]
- __do_sys_mount fs/namespace.c:3591 [inline]
- __se_sys_mount fs/namespace.c:3568 [inline]
- __x64_sys_mount+0x282/0x300 fs/namespace.c:3568
- do_syscall_x64 arch/x86/entry/common.c:50 [inline]
- do_syscall_64+0x38/0x90 arch/x86/entry/common.c:80
- entry_SYSCALL_64_after_hwframe+0x63/0xcd
-
-The buggy address belongs to the object at ffff888008880780
- which belongs to the cache kernfs_node_cache of size 128
-The buggy address is located 112 bytes inside of
- 128-byte region [ffff888008880780, ffff888008880800)
-
-The buggy address belongs to the physical page:
-page:00000000732833f8 refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x8880
-flags: 0x100000000000200(slab|node=0|zone=1)
-raw: 0100000000000200 0000000000000000 dead000000000122 ffff888001147280
-raw: 0000000000000000 0000000000150015 00000001ffffffff 0000000000000000
-page dumped because: kasan: bad access detected
-
-Memory state around the buggy address:
- ffff888008880680: fc fc fc fc fc fc fc fc fa fb fb fb fb fb fb fb
- ffff888008880700: fb fb fb fb fb fb fb fb fc fc fc fc fc fc fc fc
->ffff888008880780: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
-                                                             ^
- ffff888008880800: fc fc fc fc fc fc fc fc fa fb fb fb fb fb fb fb
- ffff888008880880: fb fb fb fb fb fb fb fb fc fc fc fc fc fc fc fc
-==================================================================
-
-Acked-by: Tejun Heo <tj@kernel.org>
-Cc: stable <stable@kernel.org> # -rc3
-Signed-off-by: Christian A. Ehrhardt <lk@c--e.de>
-Link: https://lore.kernel.org/r/20220913121723.691454-1-lk@c--e.de
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- fs/kernfs/dir.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
-index 1cc88ba6de90..2e9313988871 100644
---- a/fs/kernfs/dir.c
-+++ b/fs/kernfs/dir.c
-@@ -1585,8 +1585,11 @@ int kernfs_remove_by_name_ns(struct kernfs_node *parent, const char *name,
-       down_write(&root->kernfs_rwsem);
-       kn = kernfs_find_ns(parent, name, ns);
--      if (kn)
-+      if (kn) {
-+              kernfs_get(kn);
-               __kernfs_remove(kn);
-+              kernfs_put(kn);
-+      }
-       up_write(&root->kernfs_rwsem);
--- 
-2.35.1
-
index 0699f71d9f30ab7a031d11709596d361c55a4e20..0815665f9385b91c5f0c06c2498e79292d05551d 100644 (file)
@@ -87,8 +87,6 @@ iommu-vt-d-allow-nvs-regions-in-arch_rmrr_sanity_che.patch
 iommu-vt-d-clean-up-si_domain-in-the-init_dmars-erro.patch
 wifi-mt76-connac-introduce-mt76_connac_reg_map-struc.patch
 wifi-mt76-mt7921e-fix-random-fw-download-fail.patch
-usb-add-reset_resume-quirk-for-nvidia-jetson-devices.patch
-kernfs-fix-use-after-free-in-__kernfs_remove.patch
 io_uring-don-t-gate-task_work-run-on-tif_notify_sign.patch
 ext4-introduce-ext4_fc_tag_base_len-helper.patch
 ext4-factor-out-ext4_fc_get_tl.patch
diff --git a/queue-6.0/usb-add-reset_resume-quirk-for-nvidia-jetson-devices.patch b/queue-6.0/usb-add-reset_resume-quirk-for-nvidia-jetson-devices.patch
deleted file mode 100644 (file)
index d0a4296..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-From 82d197c70b3019f4a0354e50723da1e9b8bedfb0 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 19 Sep 2022 20:16:10 +0300
-Subject: USB: add RESET_RESUME quirk for NVIDIA Jetson devices in RCM
-
-From: Hannu Hartikainen <hannu@hrtk.in>
-
-[ Upstream commit fc4ade55c617dc73c7e9756b57f3230b4ff24540 ]
-
-NVIDIA Jetson devices in Force Recovery mode (RCM) do not support
-suspending, ie. flashing fails if the device has been suspended. The
-devices are still visible in lsusb and seem to work otherwise, making
-the issue hard to debug. This has been discovered in various forum
-posts, eg. [1].
-
-The patch has been tested on NVIDIA Jetson AGX Xavier, but I'm adding
-all the Jetson models listed in [2] on the assumption that they all
-behave similarly.
-
-[1]: https://forums.developer.nvidia.com/t/flashing-not-working/72365
-[2]: https://docs.nvidia.com/jetson/archives/l4t-archived/l4t-3271/index.html#page/Tegra%20Linux%20Driver%20Package%20Development%20Guide/quick_start.html
-
-Signed-off-by: Hannu Hartikainen <hannu@hrtk.in>
-Cc: stable <stable@kernel.org>  # after 6.1-rc3
-Link: https://lore.kernel.org/r/20220919171610.30484-1-hannu@hrtk.in
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/usb/core/quirks.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
-index 999b7c9697fc..0722d2131305 100644
---- a/drivers/usb/core/quirks.c
-+++ b/drivers/usb/core/quirks.c
-@@ -388,6 +388,15 @@ static const struct usb_device_id usb_quirk_list[] = {
-       /* Kingston DataTraveler 3.0 */
-       { USB_DEVICE(0x0951, 0x1666), .driver_info = USB_QUIRK_NO_LPM },
-+      /* NVIDIA Jetson devices in Force Recovery mode */
-+      { USB_DEVICE(0x0955, 0x7018), .driver_info = USB_QUIRK_RESET_RESUME },
-+      { USB_DEVICE(0x0955, 0x7019), .driver_info = USB_QUIRK_RESET_RESUME },
-+      { USB_DEVICE(0x0955, 0x7418), .driver_info = USB_QUIRK_RESET_RESUME },
-+      { USB_DEVICE(0x0955, 0x7721), .driver_info = USB_QUIRK_RESET_RESUME },
-+      { USB_DEVICE(0x0955, 0x7c18), .driver_info = USB_QUIRK_RESET_RESUME },
-+      { USB_DEVICE(0x0955, 0x7e19), .driver_info = USB_QUIRK_RESET_RESUME },
-+      { USB_DEVICE(0x0955, 0x7f21), .driver_info = USB_QUIRK_RESET_RESUME },
-+
-       /* X-Rite/Gretag-Macbeth Eye-One Pro display colorimeter */
-       { USB_DEVICE(0x0971, 0x2000), .driver_info = USB_QUIRK_NO_SET_INTF },
--- 
-2.35.1
-