]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
drop queue-6.11/ext4-filesystems-without-casefold-feature-cannot-be-.patch
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 14 Oct 2024 12:45:24 +0000 (14:45 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 14 Oct 2024 12:45:24 +0000 (14:45 +0200)
Has already been applied, and then reverted, don't add it again.

queue-6.11/ext4-filesystems-without-casefold-feature-cannot-be-.patch [deleted file]

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 (file)
index 8836c6b..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-From cdab430227e0f6cf201ab478053b27113923d6fe Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 5 Jun 2024 09:23:35 +0800
-Subject: ext4: filesystems without casefold feature cannot be mounted with
- siphash
-
-From: Lizhi Xu <lizhi.xu@windriver.com>
-
-[ 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 <lizhi.xu@windriver.com>
-Link: https://patch.msgid.link/20240605012335.44086-1-lizhi.xu@windriver.com
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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
-