From: Greg Kroah-Hartman Date: Thu, 13 Feb 2025 13:55:38 +0000 (+0100) Subject: drop ext4-filesystems-without-casefold-feature-cannot-be-mounted-with-siphash.patch X-Git-Tag: v6.6.78~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=efb9ba8d2124a560b516fc5d262c0a5df1badc26;p=thirdparty%2Fkernel%2Fstable-queue.git drop ext4-filesystems-without-casefold-feature-cannot-be-mounted-with-siphash.patch A fix up is needed after it, which no one provided :( --- diff --git a/queue-5.15/ext4-filesystems-without-casefold-feature-cannot-be-mounted-with-siphash.patch b/queue-5.15/ext4-filesystems-without-casefold-feature-cannot-be-mounted-with-siphash.patch deleted file mode 100644 index 88295bd951..0000000000 --- a/queue-5.15/ext4-filesystems-without-casefold-feature-cannot-be-mounted-with-siphash.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 985b67cd86392310d9e9326de941c22fc9340eec Mon Sep 17 00:00:00 2001 -From: Lizhi Xu -Date: Wed, 5 Jun 2024 09:23:35 +0800 -Subject: ext4: filesystems without casefold feature cannot be mounted with siphash - -From: Lizhi Xu - -commit 985b67cd86392310d9e9326de941c22fc9340eec upstream. - -When mounting the ext4 filesystem, if the default hash version is set to -DX_HASH_SIPHASH but the casefold feature is not set, exit the mounting. - -Reported-by: syzbot+340581ba9dceb7e06fb3@syzkaller.appspotmail.com -Signed-off-by: Lizhi Xu -Link: https://patch.msgid.link/20240605012335.44086-1-lizhi.xu@windriver.com -Signed-off-by: Theodore Ts'o -Signed-off-by: Bruno VERNAY -Signed-off-by: Victor Giraud -Signed-off-by: Greg Kroah-Hartman ---- - fs/ext4/super.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - ---- a/fs/ext4/super.c -+++ b/fs/ext4/super.c -@@ -3192,6 +3192,14 @@ int ext4_feature_set_ok(struct super_blo - } - #endif - -+ if (EXT4_SB(sb)->s_es->s_def_hash_version == DX_HASH_SIPHASH && -+ !ext4_has_feature_casefold(sb)) { -+ ext4_msg(sb, KERN_ERR, -+ "Filesystem without casefold feature cannot be " -+ "mounted with siphash"); -+ return 0; -+ } -+ - if (readonly) - return 1; - diff --git a/queue-5.15/series b/queue-5.15/series index 845be1d5e3..83858a1916 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -336,6 +336,5 @@ net-ncsi-use-dev_set_mac_address-for-get-mc-mac-address-handling.patch gpio-xilinx-remove-excess-kernel-doc.patch memory-tegra20-emc-correct-memory-device-mask.patch ocfs2-check-dir-i_size-in-ocfs2_find_entry.patch -ext4-filesystems-without-casefold-feature-cannot-be-mounted-with-siphash.patch mptcp-prevent-excessive-coalescing-on-receive.patch tty-xilinx_uartps-split-sysrq-handling.patch diff --git a/queue-6.1/ext4-filesystems-without-casefold-feature-cannot-be-mounted-with-siphash.patch b/queue-6.1/ext4-filesystems-without-casefold-feature-cannot-be-mounted-with-siphash.patch deleted file mode 100644 index e5930848ac..0000000000 --- a/queue-6.1/ext4-filesystems-without-casefold-feature-cannot-be-mounted-with-siphash.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 985b67cd86392310d9e9326de941c22fc9340eec Mon Sep 17 00:00:00 2001 -From: Lizhi Xu -Date: Wed, 5 Jun 2024 09:23:35 +0800 -Subject: ext4: filesystems without casefold feature cannot be mounted with siphash - -From: Lizhi Xu - -commit 985b67cd86392310d9e9326de941c22fc9340eec upstream. - -When mounting the ext4 filesystem, if the default hash version is set to -DX_HASH_SIPHASH but the casefold feature is not set, exit the mounting. - -Reported-by: syzbot+340581ba9dceb7e06fb3@syzkaller.appspotmail.com -Signed-off-by: Lizhi Xu -Link: https://patch.msgid.link/20240605012335.44086-1-lizhi.xu@windriver.com -Signed-off-by: Theodore Ts'o -Signed-off-by: Bruno VERNAY -Signed-off-by: Victor Giraud -Signed-off-by: Greg Kroah-Hartman ---- - fs/ext4/super.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - ---- a/fs/ext4/super.c -+++ b/fs/ext4/super.c -@@ -3547,6 +3547,14 @@ int ext4_feature_set_ok(struct super_blo - } - #endif - -+ if (EXT4_SB(sb)->s_es->s_def_hash_version == DX_HASH_SIPHASH && -+ !ext4_has_feature_casefold(sb)) { -+ ext4_msg(sb, KERN_ERR, -+ "Filesystem without casefold feature cannot be " -+ "mounted with siphash"); -+ return 0; -+ } -+ - if (readonly) - return 1; - diff --git a/queue-6.1/series b/queue-6.1/series index bf9c434b34..b268e206be 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -452,7 +452,6 @@ mips-ftrace-declare-ftrace_get_parent_ra_addr-as-static.patch net-ncsi-use-dev_set_mac_address-for-get-mc-mac-address-handling.patch gpio-xilinx-remove-excess-kernel-doc.patch ocfs2-check-dir-i_size-in-ocfs2_find_entry.patch -ext4-filesystems-without-casefold-feature-cannot-be-mounted-with-siphash.patch cachefiles-fix-null-pointer-dereference-in-object-file.patch mptcp-pm-only-set-fullmesh-for-subflow-endp.patch mptcp-prevent-excessive-coalescing-on-receive.patch diff --git a/queue-6.6/ext4-filesystems-without-casefold-feature-cannot-be-mounted-with-siphash.patch b/queue-6.6/ext4-filesystems-without-casefold-feature-cannot-be-mounted-with-siphash.patch deleted file mode 100644 index 2811714392..0000000000 --- a/queue-6.6/ext4-filesystems-without-casefold-feature-cannot-be-mounted-with-siphash.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 985b67cd86392310d9e9326de941c22fc9340eec Mon Sep 17 00:00:00 2001 -From: Lizhi Xu -Date: Wed, 5 Jun 2024 09:23:35 +0800 -Subject: ext4: filesystems without casefold feature cannot be mounted with siphash - -From: Lizhi Xu - -commit 985b67cd86392310d9e9326de941c22fc9340eec upstream. - -When mounting the ext4 filesystem, if the default hash version is set to -DX_HASH_SIPHASH but the casefold feature is not set, exit the mounting. - -Reported-by: syzbot+340581ba9dceb7e06fb3@syzkaller.appspotmail.com -Signed-off-by: Lizhi Xu -Link: https://patch.msgid.link/20240605012335.44086-1-lizhi.xu@windriver.com -Signed-off-by: Theodore Ts'o -Signed-off-by: Bruno VERNAY -Signed-off-by: Victor Giraud -Signed-off-by: Greg Kroah-Hartman ---- - fs/ext4/super.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - ---- a/fs/ext4/super.c -+++ b/fs/ext4/super.c -@@ -3627,6 +3627,14 @@ int ext4_feature_set_ok(struct super_blo - } - #endif - -+ if (EXT4_SB(sb)->s_es->s_def_hash_version == DX_HASH_SIPHASH && -+ !ext4_has_feature_casefold(sb)) { -+ ext4_msg(sb, KERN_ERR, -+ "Filesystem without casefold feature cannot be " -+ "mounted with siphash"); -+ return 0; -+ } -+ - if (readonly) - return 1; - diff --git a/queue-6.6/series b/queue-6.6/series index 37682a225f..59851fbff9 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -263,7 +263,6 @@ net-ncsi-use-dev_set_mac_address-for-get-mc-mac-address-handling.patch ocfs2-check-dir-i_size-in-ocfs2_find_entry.patch revert-btrfs-avoid-monopolizing-a-core-when-activating-a-swap-file.patch btrfs-avoid-monopolizing-a-core-when-activating-a-swap-file.patch -ext4-filesystems-without-casefold-feature-cannot-be-mounted-with-siphash.patch cachefiles-fix-null-pointer-dereference-in-object-file.patch mptcp-pm-only-set-fullmesh-for-subflow-endp.patch mptcp-prevent-excessive-coalescing-on-receive.patch