From: Greg Kroah-Hartman Date: Mon, 14 Oct 2024 12:45:24 +0000 (+0200) Subject: drop queue-6.11/ext4-filesystems-without-casefold-feature-cannot-be-.patch X-Git-Tag: v5.10.227~30 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=91dfc4853c1b1093a8e9c1ac455c3c8f418ed7a3;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-6.11/ext4-filesystems-without-casefold-feature-cannot-be-.patch Has already been applied, and then reverted, don't add it again. --- diff --git a/queue-6.11/ext4-filesystems-without-casefold-feature-cannot-be-.patch b/queue-6.11/ext4-filesystems-without-casefold-feature-cannot-be-.patch deleted file mode 100644 index 8836c6b3697..00000000000 --- a/queue-6.11/ext4-filesystems-without-casefold-feature-cannot-be-.patch +++ /dev/null @@ -1,43 +0,0 @@ -From cdab430227e0f6cf201ab478053b27113923d6fe Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 5 Jun 2024 09:23:35 +0800 -Subject: ext4: filesystems without casefold feature cannot be mounted with - siphash - -From: Lizhi Xu - -[ Upstream commit 985b67cd86392310d9e9326de941c22fc9340eec ] - -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: Sasha Levin ---- - fs/ext4/super.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/fs/ext4/super.c b/fs/ext4/super.c -index cd3328b031534..4b6609f44fdc4 100644 ---- a/fs/ext4/super.c -+++ b/fs/ext4/super.c -@@ -3583,6 +3583,13 @@ int ext4_feature_set_ok(struct super_block *sb, int readonly) - "mounted without CONFIG_UNICODE"); - return 0; - } -+ 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; --- -2.43.0 -