From 50a36f5a3b6490c1fd3a411ad944658d61d7ba2b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 27 Jan 2024 14:18:40 -0800 Subject: [PATCH] 5.15-stable patches added patches: btrfs-avoid-copying-btrfs_root_subvol_dead-flag-to-snapshot-of-subvolume-being-deleted.patch btrfs-defrag-reject-unknown-flags-of-btrfs_ioctl_defrag_range_args.patch btrfs-don-t-abort-filesystem-when-attempting-to-snapshot-deleted-subvolume.patch btrfs-don-t-warn-if-discard-range-is-not-aligned-to-sector.patch btrfs-ref-verify-free-ref-cache-before-clearing-mount-opt.patch btrfs-tree-checker-fix-inline-ref-size-in-error-messages.patch exec-fix-error-handling-in-begin_new_exec.patch firmware-arm_scmi-check-mailbox-smt-channel-for-consistency.patch gpiolib-acpi-ignore-touchpad-wakeup-on-gpd-g1619-04.patch hv_netvsc-calculate-correct-ring-size-when-page_size-is-not-4-kbytes.patch netfilter-nf_tables-reject-queue-drop-verdict-parameters.patch netfilter-nft_chain_filter-handle-netdev_unregister-for-inet-ingress-basechain.patch rbd-don-t-move-requests-to-the-running-list-on-errors.patch wifi-iwlwifi-fix-a-memory-corruption.patch xfs-read-only-mounts-with-fsopen-mount-api-are-busted.patch --- ...-snapshot-of-subvolume-being-deleted.patch | 116 ++++++++++++++++ ...ags-of-btrfs_ioctl_defrag_range_args.patch | 54 ++++++++ ...mpting-to-snapshot-deleted-subvolume.patch | 97 +++++++++++++ ...scard-range-is-not-aligned-to-sector.patch | 37 +++++ ...-ref-cache-before-clearing-mount-opt.patch | 57 ++++++++ ...ix-inline-ref-size-in-error-messages.patch | 35 +++++ ...fix-error-handling-in-begin_new_exec.patch | 37 +++++ ...-mailbox-smt-channel-for-consistency.patch | 96 +++++++++++++ ...nore-touchpad-wakeup-on-gpd-g1619-04.patch | 46 +++++++ ...-size-when-page_size-is-not-4-kbytes.patch | 56 ++++++++ ...reject-queue-drop-verdict-parameters.patch | 69 ++++++++++ ...nregister-for-inet-ingress-basechain.patch | 57 ++++++++ ...quests-to-the-running-list-on-errors.patch | 77 +++++++++++ queue-5.15/series | 15 +++ ...wifi-iwlwifi-fix-a-memory-corruption.patch | 36 +++++ ...nts-with-fsopen-mount-api-are-busted.patch | 127 ++++++++++++++++++ 16 files changed, 1012 insertions(+) create mode 100644 queue-5.15/btrfs-avoid-copying-btrfs_root_subvol_dead-flag-to-snapshot-of-subvolume-being-deleted.patch create mode 100644 queue-5.15/btrfs-defrag-reject-unknown-flags-of-btrfs_ioctl_defrag_range_args.patch create mode 100644 queue-5.15/btrfs-don-t-abort-filesystem-when-attempting-to-snapshot-deleted-subvolume.patch create mode 100644 queue-5.15/btrfs-don-t-warn-if-discard-range-is-not-aligned-to-sector.patch create mode 100644 queue-5.15/btrfs-ref-verify-free-ref-cache-before-clearing-mount-opt.patch create mode 100644 queue-5.15/btrfs-tree-checker-fix-inline-ref-size-in-error-messages.patch create mode 100644 queue-5.15/exec-fix-error-handling-in-begin_new_exec.patch create mode 100644 queue-5.15/firmware-arm_scmi-check-mailbox-smt-channel-for-consistency.patch create mode 100644 queue-5.15/gpiolib-acpi-ignore-touchpad-wakeup-on-gpd-g1619-04.patch create mode 100644 queue-5.15/hv_netvsc-calculate-correct-ring-size-when-page_size-is-not-4-kbytes.patch create mode 100644 queue-5.15/netfilter-nf_tables-reject-queue-drop-verdict-parameters.patch create mode 100644 queue-5.15/netfilter-nft_chain_filter-handle-netdev_unregister-for-inet-ingress-basechain.patch create mode 100644 queue-5.15/rbd-don-t-move-requests-to-the-running-list-on-errors.patch create mode 100644 queue-5.15/wifi-iwlwifi-fix-a-memory-corruption.patch create mode 100644 queue-5.15/xfs-read-only-mounts-with-fsopen-mount-api-are-busted.patch diff --git a/queue-5.15/btrfs-avoid-copying-btrfs_root_subvol_dead-flag-to-snapshot-of-subvolume-being-deleted.patch b/queue-5.15/btrfs-avoid-copying-btrfs_root_subvol_dead-flag-to-snapshot-of-subvolume-being-deleted.patch new file mode 100644 index 00000000000..1fc46c8d519 --- /dev/null +++ b/queue-5.15/btrfs-avoid-copying-btrfs_root_subvol_dead-flag-to-snapshot-of-subvolume-being-deleted.patch @@ -0,0 +1,116 @@ +From 3324d0547861b16cf436d54abba7052e0c8aa9de Mon Sep 17 00:00:00 2001 +From: Omar Sandoval +Date: Thu, 4 Jan 2024 11:48:47 -0800 +Subject: btrfs: avoid copying BTRFS_ROOT_SUBVOL_DEAD flag to snapshot of subvolume being deleted + +From: Omar Sandoval + +commit 3324d0547861b16cf436d54abba7052e0c8aa9de upstream. + +Sweet Tea spotted a race between subvolume deletion and snapshotting +that can result in the root item for the snapshot having the +BTRFS_ROOT_SUBVOL_DEAD flag set. The race is: + +Thread 1 | Thread 2 +----------------------------------------------|---------- +btrfs_delete_subvolume | + btrfs_set_root_flags(BTRFS_ROOT_SUBVOL_DEAD)| + |btrfs_mksubvol + | down_read(subvol_sem) + | create_snapshot + | ... + | create_pending_snapshot + | copy root item from source + down_write(subvol_sem) | + +This flag is only checked in send and swap activate, which this would +cause to fail mysteriously. + +create_snapshot() now checks the root refs to reject a deleted +subvolume, so we can fix this by locking subvol_sem earlier so that the +BTRFS_ROOT_SUBVOL_DEAD flag and the root refs are updated atomically. + +CC: stable@vger.kernel.org # 4.14+ +Reported-by: Sweet Tea Dorminy +Reviewed-by: Sweet Tea Dorminy +Reviewed-by: Anand Jain +Signed-off-by: Omar Sandoval +Reviewed-by: David Sterba +Signed-off-by: David Sterba +Signed-off-by: Greg Kroah-Hartman +--- + fs/btrfs/inode.c | 22 +++++++++++++--------- + 1 file changed, 13 insertions(+), 9 deletions(-) + +--- a/fs/btrfs/inode.c ++++ b/fs/btrfs/inode.c +@@ -4501,6 +4501,8 @@ int btrfs_delete_subvolume(struct inode + u64 root_flags; + int ret; + ++ down_write(&fs_info->subvol_sem); ++ + /* + * Don't allow to delete a subvolume with send in progress. This is + * inside the inode lock so the error handling that has to drop the bit +@@ -4512,25 +4514,25 @@ int btrfs_delete_subvolume(struct inode + btrfs_warn(fs_info, + "attempt to delete subvolume %llu during send", + dest->root_key.objectid); +- return -EPERM; ++ ret = -EPERM; ++ goto out_up_write; + } + if (atomic_read(&dest->nr_swapfiles)) { + spin_unlock(&dest->root_item_lock); + btrfs_warn(fs_info, + "attempt to delete subvolume %llu with active swapfile", + root->root_key.objectid); +- return -EPERM; ++ ret = -EPERM; ++ goto out_up_write; + } + root_flags = btrfs_root_flags(&dest->root_item); + btrfs_set_root_flags(&dest->root_item, + root_flags | BTRFS_ROOT_SUBVOL_DEAD); + spin_unlock(&dest->root_item_lock); + +- down_write(&fs_info->subvol_sem); +- + ret = may_destroy_subvol(dest); + if (ret) +- goto out_up_write; ++ goto out_undead; + + btrfs_init_block_rsv(&block_rsv, BTRFS_BLOCK_RSV_TEMP); + /* +@@ -4540,7 +4542,7 @@ int btrfs_delete_subvolume(struct inode + */ + ret = btrfs_subvolume_reserve_metadata(root, &block_rsv, 5, true); + if (ret) +- goto out_up_write; ++ goto out_undead; + + trans = btrfs_start_transaction(root, 0); + if (IS_ERR(trans)) { +@@ -4606,15 +4608,17 @@ out_end_trans: + inode->i_flags |= S_DEAD; + out_release: + btrfs_subvolume_release_metadata(root, &block_rsv); +-out_up_write: +- up_write(&fs_info->subvol_sem); ++out_undead: + if (ret) { + spin_lock(&dest->root_item_lock); + root_flags = btrfs_root_flags(&dest->root_item); + btrfs_set_root_flags(&dest->root_item, + root_flags & ~BTRFS_ROOT_SUBVOL_DEAD); + spin_unlock(&dest->root_item_lock); +- } else { ++ } ++out_up_write: ++ up_write(&fs_info->subvol_sem); ++ if (!ret) { + d_invalidate(dentry); + btrfs_prune_dentries(dest); + ASSERT(dest->send_in_progress == 0); diff --git a/queue-5.15/btrfs-defrag-reject-unknown-flags-of-btrfs_ioctl_defrag_range_args.patch b/queue-5.15/btrfs-defrag-reject-unknown-flags-of-btrfs_ioctl_defrag_range_args.patch new file mode 100644 index 00000000000..e53cd1dd60a --- /dev/null +++ b/queue-5.15/btrfs-defrag-reject-unknown-flags-of-btrfs_ioctl_defrag_range_args.patch @@ -0,0 +1,54 @@ +From 173431b274a9a54fc10b273b46e67f46bcf62d2e Mon Sep 17 00:00:00 2001 +From: Qu Wenruo +Date: Wed, 10 Jan 2024 08:58:26 +1030 +Subject: btrfs: defrag: reject unknown flags of btrfs_ioctl_defrag_range_args + +From: Qu Wenruo + +commit 173431b274a9a54fc10b273b46e67f46bcf62d2e upstream. + +Add extra sanity check for btrfs_ioctl_defrag_range_args::flags. + +This is not really to enhance fuzzing tests, but as a preparation for +future expansion on btrfs_ioctl_defrag_range_args. + +In the future we're going to add new members, allowing more fine tuning +for btrfs defrag. Without the -ENONOTSUPP error, there would be no way +to detect if the kernel supports those new defrag features. + +CC: stable@vger.kernel.org # 4.14+ +Reviewed-by: Filipe Manana +Signed-off-by: Qu Wenruo +Reviewed-by: David Sterba +Signed-off-by: David Sterba +Signed-off-by: Greg Kroah-Hartman +--- + fs/btrfs/ioctl.c | 4 ++++ + include/uapi/linux/btrfs.h | 3 +++ + 2 files changed, 7 insertions(+) + +--- a/fs/btrfs/ioctl.c ++++ b/fs/btrfs/ioctl.c +@@ -3183,6 +3183,10 @@ static int btrfs_ioctl_defrag(struct fil + ret = -EFAULT; + goto out; + } ++ if (range.flags & ~BTRFS_DEFRAG_RANGE_FLAGS_SUPP) { ++ ret = -EOPNOTSUPP; ++ goto out; ++ } + /* compression requires us to start the IO */ + if ((range.flags & BTRFS_DEFRAG_RANGE_COMPRESS)) { + range.flags |= BTRFS_DEFRAG_RANGE_START_IO; +--- a/include/uapi/linux/btrfs.h ++++ b/include/uapi/linux/btrfs.h +@@ -578,6 +578,9 @@ struct btrfs_ioctl_clone_range_args { + */ + #define BTRFS_DEFRAG_RANGE_COMPRESS 1 + #define BTRFS_DEFRAG_RANGE_START_IO 2 ++#define BTRFS_DEFRAG_RANGE_FLAGS_SUPP (BTRFS_DEFRAG_RANGE_COMPRESS | \ ++ BTRFS_DEFRAG_RANGE_START_IO) ++ + struct btrfs_ioctl_defrag_range_args { + /* start of the defrag operation */ + __u64 start; diff --git a/queue-5.15/btrfs-don-t-abort-filesystem-when-attempting-to-snapshot-deleted-subvolume.patch b/queue-5.15/btrfs-don-t-abort-filesystem-when-attempting-to-snapshot-deleted-subvolume.patch new file mode 100644 index 00000000000..906b13ac4bc --- /dev/null +++ b/queue-5.15/btrfs-don-t-abort-filesystem-when-attempting-to-snapshot-deleted-subvolume.patch @@ -0,0 +1,97 @@ +From 7081929ab2572920e94d70be3d332e5c9f97095a Mon Sep 17 00:00:00 2001 +From: Omar Sandoval +Date: Thu, 4 Jan 2024 11:48:46 -0800 +Subject: btrfs: don't abort filesystem when attempting to snapshot deleted subvolume + +From: Omar Sandoval + +commit 7081929ab2572920e94d70be3d332e5c9f97095a upstream. + +If the source file descriptor to the snapshot ioctl refers to a deleted +subvolume, we get the following abort: + + BTRFS: Transaction aborted (error -2) + WARNING: CPU: 0 PID: 833 at fs/btrfs/transaction.c:1875 create_pending_snapshot+0x1040/0x1190 [btrfs] + Modules linked in: pata_acpi btrfs ata_piix libata scsi_mod virtio_net blake2b_generic xor net_failover virtio_rng failover scsi_common rng_core raid6_pq libcrc32c + CPU: 0 PID: 833 Comm: t_snapshot_dele Not tainted 6.7.0-rc6 #2 + Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.3-1.fc39 04/01/2014 + RIP: 0010:create_pending_snapshot+0x1040/0x1190 [btrfs] + RSP: 0018:ffffa09c01337af8 EFLAGS: 00010282 + RAX: 0000000000000000 RBX: ffff9982053e7c78 RCX: 0000000000000027 + RDX: ffff99827dc20848 RSI: 0000000000000001 RDI: ffff99827dc20840 + RBP: ffffa09c01337c00 R08: 0000000000000000 R09: ffffa09c01337998 + R10: 0000000000000003 R11: ffffffffb96da248 R12: fffffffffffffffe + R13: ffff99820535bb28 R14: ffff99820b7bd000 R15: ffff99820381ea80 + FS: 00007fe20aadabc0(0000) GS:ffff99827dc00000(0000) knlGS:0000000000000000 + CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 + CR2: 0000559a120b502f CR3: 00000000055b6000 CR4: 00000000000006f0 + Call Trace: + + ? create_pending_snapshot+0x1040/0x1190 [btrfs] + ? __warn+0x81/0x130 + ? create_pending_snapshot+0x1040/0x1190 [btrfs] + ? report_bug+0x171/0x1a0 + ? handle_bug+0x3a/0x70 + ? exc_invalid_op+0x17/0x70 + ? asm_exc_invalid_op+0x1a/0x20 + ? create_pending_snapshot+0x1040/0x1190 [btrfs] + ? create_pending_snapshot+0x1040/0x1190 [btrfs] + create_pending_snapshots+0x92/0xc0 [btrfs] + btrfs_commit_transaction+0x66b/0xf40 [btrfs] + btrfs_mksubvol+0x301/0x4d0 [btrfs] + btrfs_mksnapshot+0x80/0xb0 [btrfs] + __btrfs_ioctl_snap_create+0x1c2/0x1d0 [btrfs] + btrfs_ioctl_snap_create_v2+0xc4/0x150 [btrfs] + btrfs_ioctl+0x8a6/0x2650 [btrfs] + ? kmem_cache_free+0x22/0x340 + ? do_sys_openat2+0x97/0xe0 + __x64_sys_ioctl+0x97/0xd0 + do_syscall_64+0x46/0xf0 + entry_SYSCALL_64_after_hwframe+0x6e/0x76 + RIP: 0033:0x7fe20abe83af + RSP: 002b:00007ffe6eff1360 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 + RAX: ffffffffffffffda RBX: 0000000000000004 RCX: 00007fe20abe83af + RDX: 00007ffe6eff23c0 RSI: 0000000050009417 RDI: 0000000000000003 + RBP: 0000000000000003 R08: 0000000000000000 R09: 00007fe20ad16cd0 + R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 + R13: 00007ffe6eff13c0 R14: 00007fe20ad45000 R15: 0000559a120b6d58 + + ---[ end trace 0000000000000000 ]--- + BTRFS: error (device vdc: state A) in create_pending_snapshot:1875: errno=-2 No such entry + BTRFS info (device vdc: state EA): forced readonly + BTRFS warning (device vdc: state EA): Skipping commit of aborted transaction. + BTRFS: error (device vdc: state EA) in cleanup_transaction:2055: errno=-2 No such entry + +This happens because create_pending_snapshot() initializes the new root +item as a copy of the source root item. This includes the refs field, +which is 0 for a deleted subvolume. The call to btrfs_insert_root() +therefore inserts a root with refs == 0. btrfs_get_new_fs_root() then +finds the root and returns -ENOENT if refs == 0, which causes +create_pending_snapshot() to abort. + +Fix it by checking the source root's refs before attempting the +snapshot, but after locking subvol_sem to avoid racing with deletion. + +CC: stable@vger.kernel.org # 4.14+ +Reviewed-by: Sweet Tea Dorminy +Reviewed-by: Anand Jain +Signed-off-by: Omar Sandoval +Reviewed-by: David Sterba +Signed-off-by: David Sterba +Signed-off-by: Greg Kroah-Hartman +--- + fs/btrfs/ioctl.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/fs/btrfs/ioctl.c ++++ b/fs/btrfs/ioctl.c +@@ -725,6 +725,9 @@ static int create_snapshot(struct btrfs_ + struct btrfs_trans_handle *trans; + int ret; + ++ if (btrfs_root_refs(&root->root_item) == 0) ++ return -ENOENT; ++ + if (!test_bit(BTRFS_ROOT_SHAREABLE, &root->state)) + return -EINVAL; + diff --git a/queue-5.15/btrfs-don-t-warn-if-discard-range-is-not-aligned-to-sector.patch b/queue-5.15/btrfs-don-t-warn-if-discard-range-is-not-aligned-to-sector.patch new file mode 100644 index 00000000000..8f3e93435f0 --- /dev/null +++ b/queue-5.15/btrfs-don-t-warn-if-discard-range-is-not-aligned-to-sector.patch @@ -0,0 +1,37 @@ +From a208b3f132b48e1f94f620024e66fea635925877 Mon Sep 17 00:00:00 2001 +From: David Sterba +Date: Mon, 15 Jan 2024 20:30:26 +0100 +Subject: btrfs: don't warn if discard range is not aligned to sector + +From: David Sterba + +commit a208b3f132b48e1f94f620024e66fea635925877 upstream. + +There's a warning in btrfs_issue_discard() when the range is not aligned +to 512 bytes, originally added in 4d89d377bbb0 ("btrfs: +btrfs_issue_discard ensure offset/length are aligned to sector +boundaries"). We can't do sub-sector writes anyway so the adjustment is +the only thing that we can do and the warning is unnecessary. + +CC: stable@vger.kernel.org # 4.19+ +Reported-by: syzbot+4a4f1eba14eb5c3417d1@syzkaller.appspotmail.com +Reviewed-by: Johannes Thumshirn +Reviewed-by: Anand Jain +Signed-off-by: David Sterba +Signed-off-by: Greg Kroah-Hartman +--- + fs/btrfs/extent-tree.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/fs/btrfs/extent-tree.c ++++ b/fs/btrfs/extent-tree.c +@@ -1206,7 +1206,8 @@ static int btrfs_issue_discard(struct bl + u64 bytes_left, end; + u64 aligned_start = ALIGN(start, 1 << 9); + +- if (WARN_ON(start != aligned_start)) { ++ /* Adjust the range to be aligned to 512B sectors if necessary. */ ++ if (start != aligned_start) { + len -= aligned_start - start; + len = round_down(len, 1 << 9); + start = aligned_start; diff --git a/queue-5.15/btrfs-ref-verify-free-ref-cache-before-clearing-mount-opt.patch b/queue-5.15/btrfs-ref-verify-free-ref-cache-before-clearing-mount-opt.patch new file mode 100644 index 00000000000..0d824ac90ac --- /dev/null +++ b/queue-5.15/btrfs-ref-verify-free-ref-cache-before-clearing-mount-opt.patch @@ -0,0 +1,57 @@ +From f03e274a8b29d1d1c1bbd7f764766cb5ca537ab7 Mon Sep 17 00:00:00 2001 +From: Fedor Pchelkin +Date: Wed, 3 Jan 2024 13:31:27 +0300 +Subject: btrfs: ref-verify: free ref cache before clearing mount opt + +From: Fedor Pchelkin + +commit f03e274a8b29d1d1c1bbd7f764766cb5ca537ab7 upstream. + +As clearing REF_VERIFY mount option indicates there were some errors in a +ref-verify process, a ref cache is not relevant anymore and should be +freed. + +btrfs_free_ref_cache() requires REF_VERIFY option being set so call +it just before clearing the mount option. + +Found by Linux Verification Center (linuxtesting.org) with Syzkaller. + +Reported-by: syzbot+be14ed7728594dc8bd42@syzkaller.appspotmail.com +Fixes: fd708b81d972 ("Btrfs: add a extent ref verify tool") +CC: stable@vger.kernel.org # 5.4+ +Closes: https://lore.kernel.org/lkml/000000000000e5a65c05ee832054@google.com/ +Reported-by: syzbot+c563a3c79927971f950f@syzkaller.appspotmail.com +Closes: https://lore.kernel.org/lkml/0000000000007fe09705fdc6086c@google.com/ +Reviewed-by: Anand Jain +Signed-off-by: Fedor Pchelkin +Reviewed-by: David Sterba +Signed-off-by: David Sterba +Signed-off-by: Greg Kroah-Hartman +--- + fs/btrfs/ref-verify.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/fs/btrfs/ref-verify.c ++++ b/fs/btrfs/ref-verify.c +@@ -883,8 +883,10 @@ int btrfs_ref_tree_mod(struct btrfs_fs_i + out_unlock: + spin_unlock(&fs_info->ref_verify_lock); + out: +- if (ret) ++ if (ret) { ++ btrfs_free_ref_cache(fs_info); + btrfs_clear_opt(fs_info->mount_opt, REF_VERIFY); ++ } + return ret; + } + +@@ -1013,8 +1015,8 @@ int btrfs_build_ref_tree(struct btrfs_fs + } + } + if (ret) { +- btrfs_clear_opt(fs_info->mount_opt, REF_VERIFY); + btrfs_free_ref_cache(fs_info); ++ btrfs_clear_opt(fs_info->mount_opt, REF_VERIFY); + } + btrfs_free_path(path); + return ret; diff --git a/queue-5.15/btrfs-tree-checker-fix-inline-ref-size-in-error-messages.patch b/queue-5.15/btrfs-tree-checker-fix-inline-ref-size-in-error-messages.patch new file mode 100644 index 00000000000..cf48ea87446 --- /dev/null +++ b/queue-5.15/btrfs-tree-checker-fix-inline-ref-size-in-error-messages.patch @@ -0,0 +1,35 @@ +From f398e70dd69e6ceea71463a5380e6118f219197e Mon Sep 17 00:00:00 2001 +From: Chung-Chiang Cheng +Date: Fri, 12 Jan 2024 15:41:05 +0800 +Subject: btrfs: tree-checker: fix inline ref size in error messages + +From: Chung-Chiang Cheng + +commit f398e70dd69e6ceea71463a5380e6118f219197e upstream. + +The error message should accurately reflect the size rather than the +type. + +Fixes: f82d1c7ca8ae ("btrfs: tree-checker: Add EXTENT_ITEM and METADATA_ITEM check") +CC: stable@vger.kernel.org # 5.4+ +Reviewed-by: Filipe Manana +Reviewed-by: Qu Wenruo +Signed-off-by: Chung-Chiang Cheng +Reviewed-by: David Sterba +Signed-off-by: David Sterba +Signed-off-by: Greg Kroah-Hartman +--- + fs/btrfs/tree-checker.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/fs/btrfs/tree-checker.c ++++ b/fs/btrfs/tree-checker.c +@@ -1382,7 +1382,7 @@ static int check_extent_item(struct exte + if (unlikely(ptr + btrfs_extent_inline_ref_size(inline_type) > end)) { + extent_err(leaf, slot, + "inline ref item overflows extent item, ptr %lu iref size %u end %lu", +- ptr, inline_type, end); ++ ptr, btrfs_extent_inline_ref_size(inline_type), end); + return -EUCLEAN; + } + diff --git a/queue-5.15/exec-fix-error-handling-in-begin_new_exec.patch b/queue-5.15/exec-fix-error-handling-in-begin_new_exec.patch new file mode 100644 index 00000000000..3d8abd36311 --- /dev/null +++ b/queue-5.15/exec-fix-error-handling-in-begin_new_exec.patch @@ -0,0 +1,37 @@ +From 84c39ec57d409e803a9bb6e4e85daf1243e0e80b Mon Sep 17 00:00:00 2001 +From: Bernd Edlinger +Date: Mon, 22 Jan 2024 19:34:21 +0100 +Subject: exec: Fix error handling in begin_new_exec() + +From: Bernd Edlinger + +commit 84c39ec57d409e803a9bb6e4e85daf1243e0e80b upstream. + +If get_unused_fd_flags() fails, the error handling is incomplete because +bprm->cred is already set to NULL, and therefore free_bprm will not +unlock the cred_guard_mutex. Note there are two error conditions which +end up here, one before and one after bprm->cred is cleared. + +Fixes: b8a61c9e7b4a ("exec: Generic execfd support") +Signed-off-by: Bernd Edlinger +Acked-by: Eric W. Biederman +Link: https://lore.kernel.org/r/AS8P193MB128517ADB5EFF29E04389EDAE4752@AS8P193MB1285.EURP193.PROD.OUTLOOK.COM +Cc: stable@vger.kernel.org +Signed-off-by: Kees Cook +Signed-off-by: Greg Kroah-Hartman +--- + fs/exec.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/fs/exec.c ++++ b/fs/exec.c +@@ -1410,6 +1410,9 @@ int begin_new_exec(struct linux_binprm * + + out_unlock: + up_write(&me->signal->exec_update_lock); ++ if (!bprm->cred) ++ mutex_unlock(&me->signal->cred_guard_mutex); ++ + out: + return retval; + } diff --git a/queue-5.15/firmware-arm_scmi-check-mailbox-smt-channel-for-consistency.patch b/queue-5.15/firmware-arm_scmi-check-mailbox-smt-channel-for-consistency.patch new file mode 100644 index 00000000000..01fd37bebd6 --- /dev/null +++ b/queue-5.15/firmware-arm_scmi-check-mailbox-smt-channel-for-consistency.patch @@ -0,0 +1,96 @@ +From 437a310b22244d4e0b78665c3042e5d1c0f45306 Mon Sep 17 00:00:00 2001 +From: Cristian Marussi +Date: Wed, 20 Dec 2023 17:21:12 +0000 +Subject: firmware: arm_scmi: Check mailbox/SMT channel for consistency + +From: Cristian Marussi + +commit 437a310b22244d4e0b78665c3042e5d1c0f45306 upstream. + +On reception of a completion interrupt the shared memory area is accessed +to retrieve the message header at first and then, if the message sequence +number identifies a transaction which is still pending, the related +payload is fetched too. + +When an SCMI command times out the channel ownership remains with the +platform until eventually a late reply is received and, as a consequence, +any further transmission attempt remains pending, waiting for the channel +to be relinquished by the platform. + +Once that late reply is received the channel ownership is given back +to the agent and any pending request is then allowed to proceed and +overwrite the SMT area of the just delivered late reply; then the wait +for the reply to the new request starts. + +It has been observed that the spurious IRQ related to the late reply can +be wrongly associated with the freshly enqueued request: when that happens +the SCMI stack in-flight lookup procedure is fooled by the fact that the +message header now present in the SMT area is related to the new pending +transaction, even though the real reply has still to arrive. + +This race-condition on the A2P channel can be detected by looking at the +channel status bits: a genuine reply from the platform will have set the +channel free bit before triggering the completion IRQ. + +Add a consistency check to validate such condition in the A2P ISR. + +Reported-by: Xinglong Yang +Closes: https://lore.kernel.org/all/PUZPR06MB54981E6FA00D82BFDBB864FBF08DA@PUZPR06MB5498.apcprd06.prod.outlook.com/ +Fixes: 5c8a47a5a91d ("firmware: arm_scmi: Make scmi core independent of the transport type") +Cc: stable@vger.kernel.org # 5.15+ +Signed-off-by: Cristian Marussi +Tested-by: Xinglong Yang +Link: https://lore.kernel.org/r/20231220172112.763539-1-cristian.marussi@arm.com +Signed-off-by: Sudeep Holla +Signed-off-by: Greg Kroah-Hartman +--- + drivers/firmware/arm_scmi/common.h | 1 + + drivers/firmware/arm_scmi/mailbox.c | 14 ++++++++++++++ + drivers/firmware/arm_scmi/shmem.c | 6 ++++++ + 3 files changed, 21 insertions(+) + +--- a/drivers/firmware/arm_scmi/common.h ++++ b/drivers/firmware/arm_scmi/common.h +@@ -439,6 +439,7 @@ void shmem_fetch_notification(struct scm + void shmem_clear_channel(struct scmi_shared_mem __iomem *shmem); + bool shmem_poll_done(struct scmi_shared_mem __iomem *shmem, + struct scmi_xfer *xfer); ++bool shmem_channel_free(struct scmi_shared_mem __iomem *shmem); + + /* declarations for message passing transports */ + struct scmi_msg_payld; +--- a/drivers/firmware/arm_scmi/mailbox.c ++++ b/drivers/firmware/arm_scmi/mailbox.c +@@ -43,6 +43,20 @@ static void rx_callback(struct mbox_clie + { + struct scmi_mailbox *smbox = client_to_scmi_mailbox(cl); + ++ /* ++ * An A2P IRQ is NOT valid when received while the platform still has ++ * the ownership of the channel, because the platform at first releases ++ * the SMT channel and then sends the completion interrupt. ++ * ++ * This addresses a possible race condition in which a spurious IRQ from ++ * a previous timed-out reply which arrived late could be wrongly ++ * associated with the next pending transaction. ++ */ ++ if (cl->knows_txdone && !shmem_channel_free(smbox->shmem)) { ++ dev_warn(smbox->cinfo->dev, "Ignoring spurious A2P IRQ !\n"); ++ return; ++ } ++ + scmi_rx_callback(smbox->cinfo, shmem_read_header(smbox->shmem), NULL); + } + +--- a/drivers/firmware/arm_scmi/shmem.c ++++ b/drivers/firmware/arm_scmi/shmem.c +@@ -99,3 +99,9 @@ bool shmem_poll_done(struct scmi_shared_ + (SCMI_SHMEM_CHAN_STAT_CHANNEL_ERROR | + SCMI_SHMEM_CHAN_STAT_CHANNEL_FREE); + } ++ ++bool shmem_channel_free(struct scmi_shared_mem __iomem *shmem) ++{ ++ return (ioread32(&shmem->channel_status) & ++ SCMI_SHMEM_CHAN_STAT_CHANNEL_FREE); ++} diff --git a/queue-5.15/gpiolib-acpi-ignore-touchpad-wakeup-on-gpd-g1619-04.patch b/queue-5.15/gpiolib-acpi-ignore-touchpad-wakeup-on-gpd-g1619-04.patch new file mode 100644 index 00000000000..f7ed5fdf597 --- /dev/null +++ b/queue-5.15/gpiolib-acpi-ignore-touchpad-wakeup-on-gpd-g1619-04.patch @@ -0,0 +1,46 @@ +From 805c74eac8cb306dc69b87b6b066ab4da77ceaf1 Mon Sep 17 00:00:00 2001 +From: Mario Limonciello +Date: Wed, 17 Jan 2024 08:29:42 -0600 +Subject: gpiolib: acpi: Ignore touchpad wakeup on GPD G1619-04 + +From: Mario Limonciello + +commit 805c74eac8cb306dc69b87b6b066ab4da77ceaf1 upstream. + +Spurious wakeups are reported on the GPD G1619-04 which +can be absolved by programming the GPIO to ignore wakeups. + +Cc: stable@vger.kernel.org +Reported-and-tested-by: George Melikov +Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3073 +Signed-off-by: Mario Limonciello +Reviewed-by: Andy Shevchenko +Signed-off-by: Bartosz Golaszewski +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpio/gpiolib-acpi.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +--- a/drivers/gpio/gpiolib-acpi.c ++++ b/drivers/gpio/gpiolib-acpi.c +@@ -1572,6 +1572,20 @@ static const struct dmi_system_id gpioli + .ignore_wake = "INT33FF:01@0", + }, + }, ++ { ++ /* ++ * Spurious wakeups from TP_ATTN# pin ++ * Found in BIOS 0.35 ++ * https://gitlab.freedesktop.org/drm/amd/-/issues/3073 ++ */ ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "GPD"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "G1619-04"), ++ }, ++ .driver_data = &(struct acpi_gpiolib_dmi_quirk) { ++ .ignore_wake = "PNP0C50:00@8", ++ }, ++ }, + {} /* Terminating entry */ + }; + diff --git a/queue-5.15/hv_netvsc-calculate-correct-ring-size-when-page_size-is-not-4-kbytes.patch b/queue-5.15/hv_netvsc-calculate-correct-ring-size-when-page_size-is-not-4-kbytes.patch new file mode 100644 index 00000000000..ca48a3cc849 --- /dev/null +++ b/queue-5.15/hv_netvsc-calculate-correct-ring-size-when-page_size-is-not-4-kbytes.patch @@ -0,0 +1,56 @@ +From 6941f67ad37d5465b75b9ffc498fcf6897a3c00e Mon Sep 17 00:00:00 2001 +From: Michael Kelley +Date: Mon, 22 Jan 2024 08:20:28 -0800 +Subject: hv_netvsc: Calculate correct ring size when PAGE_SIZE is not 4 Kbytes + +From: Michael Kelley + +commit 6941f67ad37d5465b75b9ffc498fcf6897a3c00e upstream. + +Current code in netvsc_drv_init() incorrectly assumes that PAGE_SIZE +is 4 Kbytes, which is wrong on ARM64 with 16K or 64K page size. As a +result, the default VMBus ring buffer size on ARM64 with 64K page size +is 8 Mbytes instead of the expected 512 Kbytes. While this doesn't break +anything, a typical VM with 8 vCPUs and 8 netvsc channels wastes 120 +Mbytes (8 channels * 2 ring buffers/channel * 7.5 Mbytes/ring buffer). + +Unfortunately, the module parameter specifying the ring buffer size +is in units of 4 Kbyte pages. Ideally, it should be in units that +are independent of PAGE_SIZE, but backwards compatibility prevents +changing that now. + +Fix this by having netvsc_drv_init() hardcode 4096 instead of using +PAGE_SIZE when calculating the ring buffer size in bytes. Also +use the VMBUS_RING_SIZE macro to ensure proper alignment when running +with page size larger than 4K. + +Cc: # 5.15.x +Fixes: 7aff79e297ee ("Drivers: hv: Enable Hyper-V code to be built on ARM64") +Signed-off-by: Michael Kelley +Link: https://lore.kernel.org/r/20240122162028.348885-1-mhklinux@outlook.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/hyperv/netvsc_drv.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/net/hyperv/netvsc_drv.c ++++ b/drivers/net/hyperv/netvsc_drv.c +@@ -44,7 +44,7 @@ + + static unsigned int ring_size __ro_after_init = 128; + module_param(ring_size, uint, 0444); +-MODULE_PARM_DESC(ring_size, "Ring buffer size (# of pages)"); ++MODULE_PARM_DESC(ring_size, "Ring buffer size (# of 4K pages)"); + unsigned int netvsc_ring_bytes __ro_after_init; + + static const u32 default_msg = NETIF_MSG_DRV | NETIF_MSG_PROBE | +@@ -2824,7 +2824,7 @@ static int __init netvsc_drv_init(void) + pr_info("Increased ring_size to %u (min allowed)\n", + ring_size); + } +- netvsc_ring_bytes = ring_size * PAGE_SIZE; ++ netvsc_ring_bytes = VMBUS_RING_SIZE(ring_size * 4096); + + register_netdevice_notifier(&netvsc_netdev_notifier); + diff --git a/queue-5.15/netfilter-nf_tables-reject-queue-drop-verdict-parameters.patch b/queue-5.15/netfilter-nf_tables-reject-queue-drop-verdict-parameters.patch new file mode 100644 index 00000000000..dcaa6198ac3 --- /dev/null +++ b/queue-5.15/netfilter-nf_tables-reject-queue-drop-verdict-parameters.patch @@ -0,0 +1,69 @@ +From f342de4e2f33e0e39165d8639387aa6c19dff660 Mon Sep 17 00:00:00 2001 +From: Florian Westphal +Date: Sat, 20 Jan 2024 22:50:04 +0100 +Subject: netfilter: nf_tables: reject QUEUE/DROP verdict parameters + +From: Florian Westphal + +commit f342de4e2f33e0e39165d8639387aa6c19dff660 upstream. + +This reverts commit e0abdadcc6e1. + +core.c:nf_hook_slow assumes that the upper 16 bits of NF_DROP +verdicts contain a valid errno, i.e. -EPERM, -EHOSTUNREACH or similar, +or 0. + +Due to the reverted commit, its possible to provide a positive +value, e.g. NF_ACCEPT (1), which results in use-after-free. + +Its not clear to me why this commit was made. + +NF_QUEUE is not used by nftables; "queue" rules in nftables +will result in use of "nft_queue" expression. + +If we later need to allow specifiying errno values from userspace +(do not know why), this has to call NF_DROP_GETERR and check that +"err <= 0" holds true. + +Fixes: e0abdadcc6e1 ("netfilter: nf_tables: accept QUEUE/DROP verdict parameters") +Cc: stable@vger.kernel.org +Reported-by: Notselwyn +Signed-off-by: Florian Westphal +Signed-off-by: Pablo Neira Ayuso +Signed-off-by: Greg Kroah-Hartman +--- + net/netfilter/nf_tables_api.c | 16 ++++++---------- + 1 file changed, 6 insertions(+), 10 deletions(-) + +--- a/net/netfilter/nf_tables_api.c ++++ b/net/netfilter/nf_tables_api.c +@@ -10251,16 +10251,10 @@ static int nft_verdict_init(const struct + data->verdict.code = ntohl(nla_get_be32(tb[NFTA_VERDICT_CODE])); + + switch (data->verdict.code) { +- default: +- switch (data->verdict.code & NF_VERDICT_MASK) { +- case NF_ACCEPT: +- case NF_DROP: +- case NF_QUEUE: +- break; +- default: +- return -EINVAL; +- } +- fallthrough; ++ case NF_ACCEPT: ++ case NF_DROP: ++ case NF_QUEUE: ++ break; + case NFT_CONTINUE: + case NFT_BREAK: + case NFT_RETURN: +@@ -10295,6 +10289,8 @@ static int nft_verdict_init(const struct + + data->verdict.chain = chain; + break; ++ default: ++ return -EINVAL; + } + + desc->len = sizeof(data->verdict); diff --git a/queue-5.15/netfilter-nft_chain_filter-handle-netdev_unregister-for-inet-ingress-basechain.patch b/queue-5.15/netfilter-nft_chain_filter-handle-netdev_unregister-for-inet-ingress-basechain.patch new file mode 100644 index 00000000000..77888663ed2 --- /dev/null +++ b/queue-5.15/netfilter-nft_chain_filter-handle-netdev_unregister-for-inet-ingress-basechain.patch @@ -0,0 +1,57 @@ +From 01acb2e8666a6529697141a6017edbf206921913 Mon Sep 17 00:00:00 2001 +From: Pablo Neira Ayuso +Date: Thu, 18 Jan 2024 10:56:26 +0100 +Subject: netfilter: nft_chain_filter: handle NETDEV_UNREGISTER for inet/ingress basechain + +From: Pablo Neira Ayuso + +commit 01acb2e8666a6529697141a6017edbf206921913 upstream. + +Remove netdevice from inet/ingress basechain in case NETDEV_UNREGISTER +event is reported, otherwise a stale reference to netdevice remains in +the hook list. + +Fixes: 60a3815da702 ("netfilter: add inet ingress support") +Cc: stable@vger.kernel.org +Signed-off-by: Pablo Neira Ayuso +Signed-off-by: Greg Kroah-Hartman +--- + net/netfilter/nft_chain_filter.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +--- a/net/netfilter/nft_chain_filter.c ++++ b/net/netfilter/nft_chain_filter.c +@@ -355,9 +355,10 @@ static int nf_tables_netdev_event(struct + unsigned long event, void *ptr) + { + struct net_device *dev = netdev_notifier_info_to_dev(ptr); ++ struct nft_base_chain *basechain; + struct nftables_pernet *nft_net; +- struct nft_table *table; + struct nft_chain *chain, *nr; ++ struct nft_table *table; + struct nft_ctx ctx = { + .net = dev_net(dev), + }; +@@ -369,7 +370,8 @@ static int nf_tables_netdev_event(struct + nft_net = nft_pernet(ctx.net); + mutex_lock(&nft_net->commit_mutex); + list_for_each_entry(table, &nft_net->tables, list) { +- if (table->family != NFPROTO_NETDEV) ++ if (table->family != NFPROTO_NETDEV && ++ table->family != NFPROTO_INET) + continue; + + ctx.family = table->family; +@@ -378,6 +380,11 @@ static int nf_tables_netdev_event(struct + if (!nft_is_base_chain(chain)) + continue; + ++ basechain = nft_base_chain(chain); ++ if (table->family == NFPROTO_INET && ++ basechain->ops.hooknum != NF_INET_INGRESS) ++ continue; ++ + ctx.chain = chain; + nft_netdev_event(event, dev, &ctx); + } diff --git a/queue-5.15/rbd-don-t-move-requests-to-the-running-list-on-errors.patch b/queue-5.15/rbd-don-t-move-requests-to-the-running-list-on-errors.patch new file mode 100644 index 00000000000..74fb959111f --- /dev/null +++ b/queue-5.15/rbd-don-t-move-requests-to-the-running-list-on-errors.patch @@ -0,0 +1,77 @@ +From ded080c86b3f99683774af0441a58fc2e3d60cae Mon Sep 17 00:00:00 2001 +From: Ilya Dryomov +Date: Wed, 17 Jan 2024 18:59:44 +0100 +Subject: rbd: don't move requests to the running list on errors + +From: Ilya Dryomov + +commit ded080c86b3f99683774af0441a58fc2e3d60cae upstream. + +The running list is supposed to contain requests that are pinning the +exclusive lock, i.e. those that must be flushed before exclusive lock +is released. When wake_lock_waiters() is called to handle an error, +requests on the acquiring list are failed with that error and no +flushing takes place. Briefly moving them to the running list is not +only pointless but also harmful: if exclusive lock gets acquired +before all of their state machines are scheduled and go through +rbd_lock_del_request(), we trigger + + rbd_assert(list_empty(&rbd_dev->running_list)); + +in rbd_try_acquire_lock(). + +Cc: stable@vger.kernel.org +Fixes: 637cd060537d ("rbd: new exclusive lock wait/wake code") +Signed-off-by: Ilya Dryomov +Reviewed-by: Dongsheng Yang +Signed-off-by: Greg Kroah-Hartman +--- + drivers/block/rbd.c | 22 ++++++++++++++-------- + 1 file changed, 14 insertions(+), 8 deletions(-) + +--- a/drivers/block/rbd.c ++++ b/drivers/block/rbd.c +@@ -3454,14 +3454,15 @@ static bool rbd_lock_add_request(struct + static void rbd_lock_del_request(struct rbd_img_request *img_req) + { + struct rbd_device *rbd_dev = img_req->rbd_dev; +- bool need_wakeup; ++ bool need_wakeup = false; + + lockdep_assert_held(&rbd_dev->lock_rwsem); + spin_lock(&rbd_dev->lock_lists_lock); +- rbd_assert(!list_empty(&img_req->lock_item)); +- list_del_init(&img_req->lock_item); +- need_wakeup = (rbd_dev->lock_state == RBD_LOCK_STATE_RELEASING && +- list_empty(&rbd_dev->running_list)); ++ if (!list_empty(&img_req->lock_item)) { ++ list_del_init(&img_req->lock_item); ++ need_wakeup = (rbd_dev->lock_state == RBD_LOCK_STATE_RELEASING && ++ list_empty(&rbd_dev->running_list)); ++ } + spin_unlock(&rbd_dev->lock_lists_lock); + if (need_wakeup) + complete(&rbd_dev->releasing_wait); +@@ -3844,14 +3845,19 @@ static void wake_lock_waiters(struct rbd + return; + } + +- list_for_each_entry(img_req, &rbd_dev->acquiring_list, lock_item) { ++ while (!list_empty(&rbd_dev->acquiring_list)) { ++ img_req = list_first_entry(&rbd_dev->acquiring_list, ++ struct rbd_img_request, lock_item); + mutex_lock(&img_req->state_mutex); + rbd_assert(img_req->state == RBD_IMG_EXCLUSIVE_LOCK); ++ if (!result) ++ list_move_tail(&img_req->lock_item, ++ &rbd_dev->running_list); ++ else ++ list_del_init(&img_req->lock_item); + rbd_img_schedule(img_req, result); + mutex_unlock(&img_req->state_mutex); + } +- +- list_splice_tail_init(&rbd_dev->acquiring_list, &rbd_dev->running_list); + } + + static bool locker_equal(const struct ceph_locker *lhs, diff --git a/queue-5.15/series b/queue-5.15/series index 95c81cc2fa0..1e30be6a879 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -76,3 +76,18 @@ btrfs-fix-infinite-directory-reads.patch btrfs-set-last-dir-index-to-the-current-last-index-when-opening-dir.patch btrfs-refresh-dir-last-index-during-a-rewinddir-3-call.patch btrfs-fix-race-between-reading-a-directory-and-adding-entries-to-it.patch +btrfs-avoid-copying-btrfs_root_subvol_dead-flag-to-snapshot-of-subvolume-being-deleted.patch +btrfs-ref-verify-free-ref-cache-before-clearing-mount-opt.patch +btrfs-tree-checker-fix-inline-ref-size-in-error-messages.patch +btrfs-don-t-warn-if-discard-range-is-not-aligned-to-sector.patch +btrfs-defrag-reject-unknown-flags-of-btrfs_ioctl_defrag_range_args.patch +btrfs-don-t-abort-filesystem-when-attempting-to-snapshot-deleted-subvolume.patch +rbd-don-t-move-requests-to-the-running-list-on-errors.patch +exec-fix-error-handling-in-begin_new_exec.patch +wifi-iwlwifi-fix-a-memory-corruption.patch +hv_netvsc-calculate-correct-ring-size-when-page_size-is-not-4-kbytes.patch +netfilter-nft_chain_filter-handle-netdev_unregister-for-inet-ingress-basechain.patch +netfilter-nf_tables-reject-queue-drop-verdict-parameters.patch +firmware-arm_scmi-check-mailbox-smt-channel-for-consistency.patch +xfs-read-only-mounts-with-fsopen-mount-api-are-busted.patch +gpiolib-acpi-ignore-touchpad-wakeup-on-gpd-g1619-04.patch diff --git a/queue-5.15/wifi-iwlwifi-fix-a-memory-corruption.patch b/queue-5.15/wifi-iwlwifi-fix-a-memory-corruption.patch new file mode 100644 index 00000000000..b9b0e07adbe --- /dev/null +++ b/queue-5.15/wifi-iwlwifi-fix-a-memory-corruption.patch @@ -0,0 +1,36 @@ +From cf4a0d840ecc72fcf16198d5e9c505ab7d5a5e4d Mon Sep 17 00:00:00 2001 +From: Emmanuel Grumbach +Date: Thu, 11 Jan 2024 15:07:25 +0200 +Subject: wifi: iwlwifi: fix a memory corruption + +From: Emmanuel Grumbach + +commit cf4a0d840ecc72fcf16198d5e9c505ab7d5a5e4d upstream. + +iwl_fw_ini_trigger_tlv::data is a pointer to a __le32, which means that +if we copy to iwl_fw_ini_trigger_tlv::data + offset while offset is in +bytes, we'll write past the buffer. + +Cc: stable@vger.kernel.org +Closes: https://bugzilla.kernel.org/show_bug.cgi?id=218233 +Fixes: cf29c5b66b9f ("iwlwifi: dbg_ini: implement time point handling") +Signed-off-by: Emmanuel Grumbach +Signed-off-by: Miri Korenblit +Link: https://msgid.link/20240111150610.2d2b8b870194.I14ed76505a5cf87304e0c9cc05cc0ae85ed3bf91@changeid +Signed-off-by: Johannes Berg +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c ++++ b/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c +@@ -836,7 +836,7 @@ static int iwl_dbg_tlv_override_trig_nod + node_trig = (void *)node_tlv->data; + } + +- memcpy(node_trig->data + offset, trig->data, trig_data_len); ++ memcpy((u8 *)node_trig->data + offset, trig->data, trig_data_len); + node_tlv->length = cpu_to_le32(size); + + if (policy & IWL_FW_INI_APPLY_POLICY_OVERRIDE_CFG) { diff --git a/queue-5.15/xfs-read-only-mounts-with-fsopen-mount-api-are-busted.patch b/queue-5.15/xfs-read-only-mounts-with-fsopen-mount-api-are-busted.patch new file mode 100644 index 00000000000..8e16984f6e4 --- /dev/null +++ b/queue-5.15/xfs-read-only-mounts-with-fsopen-mount-api-are-busted.patch @@ -0,0 +1,127 @@ +From d8d222e09dab84a17bb65dda4b94d01c565f5327 Mon Sep 17 00:00:00 2001 +From: Dave Chinner +Date: Tue, 16 Jan 2024 15:33:07 +1100 +Subject: xfs: read only mounts with fsopen mount API are busted + +From: Dave Chinner + +commit d8d222e09dab84a17bb65dda4b94d01c565f5327 upstream. + +Recently xfs/513 started failing on my test machines testing "-o +ro,norecovery" mount options. This was being emitted in dmesg: + +[ 9906.932724] XFS (pmem0): no-recovery mounts must be read-only. + +Turns out, readonly mounts with the fsopen()/fsconfig() mount API +have been busted since day zero. It's only taken 5 years for debian +unstable to start using this "new" mount API, and shortly after this +I noticed xfs/513 had started to fail as per above. + +The syscall trace is: + +fsopen("xfs", FSOPEN_CLOEXEC) = 3 +mount_setattr(-1, NULL, 0, NULL, 0) = -1 EINVAL (Invalid argument) +..... +fsconfig(3, FSCONFIG_SET_STRING, "source", "/dev/pmem0", 0) = 0 +fsconfig(3, FSCONFIG_SET_FLAG, "ro", NULL, 0) = 0 +fsconfig(3, FSCONFIG_SET_FLAG, "norecovery", NULL, 0) = 0 +fsconfig(3, FSCONFIG_CMD_CREATE, NULL, NULL, 0) = -1 EINVAL (Invalid argument) +close(3) = 0 + +Showing that the actual mount instantiation (FSCONFIG_CMD_CREATE) is +what threw out the error. + +During mount instantiation, we call xfs_fs_validate_params() which +does: + + /* No recovery flag requires a read-only mount */ + if (xfs_has_norecovery(mp) && !xfs_is_readonly(mp)) { + xfs_warn(mp, "no-recovery mounts must be read-only."); + return -EINVAL; + } + +and xfs_is_readonly() checks internal mount flags for read only +state. This state is set in xfs_init_fs_context() from the +context superblock flag state: + + /* + * Copy binary VFS mount flags we are interested in. + */ + if (fc->sb_flags & SB_RDONLY) + set_bit(XFS_OPSTATE_READONLY, &mp->m_opstate); + +With the old mount API, all of the VFS specific superblock flags +had already been parsed and set before xfs_init_fs_context() is +called, so this all works fine. + +However, in the brave new fsopen/fsconfig world, +xfs_init_fs_context() is called from fsopen() context, before any +VFS superblock have been set or parsed. Hence if we use fsopen(), +the internal XFS readonly state is *never set*. Hence anything that +depends on xfs_is_readonly() actually returning true for read only +mounts is broken if fsopen() has been used to mount the filesystem. + +Fix this by moving this internal state initialisation to +xfs_fs_fill_super() before we attempt to validate the parameters +that have been set prior to the FSCONFIG_CMD_CREATE call being made. + +Signed-off-by: Dave Chinner +Fixes: 73e5fff98b64 ("xfs: switch to use the new mount-api") +cc: stable@vger.kernel.org +Reviewed-by: Christoph Hellwig +Signed-off-by: Chandan Babu R +Signed-off-by: Greg Kroah-Hartman +--- + fs/xfs/xfs_super.c | 27 +++++++++++++++++---------- + 1 file changed, 17 insertions(+), 10 deletions(-) + +--- a/fs/xfs/xfs_super.c ++++ b/fs/xfs/xfs_super.c +@@ -1436,6 +1436,18 @@ xfs_fs_fill_super( + + mp->m_super = sb; + ++ /* ++ * Copy VFS mount flags from the context now that all parameter parsing ++ * is guaranteed to have been completed by either the old mount API or ++ * the newer fsopen/fsconfig API. ++ */ ++ if (fc->sb_flags & SB_RDONLY) ++ set_bit(XFS_OPSTATE_READONLY, &mp->m_opstate); ++ if (fc->sb_flags & SB_DIRSYNC) ++ mp->m_features |= XFS_FEAT_DIRSYNC; ++ if (fc->sb_flags & SB_SYNCHRONOUS) ++ mp->m_features |= XFS_FEAT_WSYNC; ++ + error = xfs_fs_validate_params(mp); + if (error) + goto out_free_names; +@@ -1910,6 +1922,11 @@ static const struct fs_context_operation + .free = xfs_fs_free, + }; + ++/* ++ * WARNING: do not initialise any parameters in this function that depend on ++ * mount option parsing having already been performed as this can be called from ++ * fsopen() before any parameters have been set. ++ */ + static int xfs_init_fs_context( + struct fs_context *fc) + { +@@ -1942,16 +1959,6 @@ static int xfs_init_fs_context( + mp->m_logbsize = -1; + mp->m_allocsize_log = 16; /* 64k */ + +- /* +- * Copy binary VFS mount flags we are interested in. +- */ +- if (fc->sb_flags & SB_RDONLY) +- set_bit(XFS_OPSTATE_READONLY, &mp->m_opstate); +- if (fc->sb_flags & SB_DIRSYNC) +- mp->m_features |= XFS_FEAT_DIRSYNC; +- if (fc->sb_flags & SB_SYNCHRONOUS) +- mp->m_features |= XFS_FEAT_WSYNC; +- + fc->s_fs_info = mp; + fc->ops = &xfs_context_ops; + -- 2.47.3