From: Greg Kroah-Hartman Date: Sun, 11 Jan 2026 13:57:28 +0000 (+0100) Subject: fix up ext4 patches X-Git-Tag: v6.1.160~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b0127aff64a1717932d6d3e1c6a37153bd7bc7a;p=thirdparty%2Fkernel%2Fstable-queue.git fix up ext4 patches --- diff --git a/queue-6.6/ext4-fix-error-message-when-rejecting-the-default-hash.patch b/queue-6.6/ext4-fix-error-message-when-rejecting-the-default-hash.patch index e7f0c9645e..1dfce99e07 100644 --- a/queue-6.6/ext4-fix-error-message-when-rejecting-the-default-hash.patch +++ b/queue-6.6/ext4-fix-error-message-when-rejecting-the-default-hash.patch @@ -1,14 +1,14 @@ -From stable+bounces-201041-greg=kroah.com@vger.kernel.org Mon Dec 15 14:40:38 2025 -From: Ankan Biswas -Date: Mon, 15 Dec 2025 19:09:57 +0530 +From stable+bounces-206361-greg=kroah.com@vger.kernel.org Thu Jan 8 16:07:09 2026 +From: Thadeu Lima de Souza Cascardo +Date: Thu, 8 Jan 2026 12:03:50 -0300 Subject: ext4: fix error message when rejecting the default hash To: stable@vger.kernel.org -Cc: gregkh@linuxfoundation.org, sashal@kernel.org, tytso@mit.edu, adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, skhan@linuxfoundation.org, khalid@kernel.org, david.hunter.linux@gmail.com, linux-kernel-mentees@vger.kernel.org, Gabriel Krisman Bertazi , Ankan Biswas -Message-ID: <20251215133957.4236-1-spyjetfayed@gmail.com> +Cc: Gabriel Krisman Bertazi , Theodore Ts'o , Thadeu Lima de Souza Cascardo +Message-ID: <20260108150350.3354622-2-cascardo@igalia.com> From: Gabriel Krisman Bertazi -[ Upstream commit a2187431c395cdfbf144e3536f25468c64fc7cfa ] +commit a2187431c395cdfbf144e3536f25468c64fc7cfa upstream. Commit 985b67cd8639 ("ext4: filesystems without casefold feature cannot be mounted with siphash") properly rejects volumes where @@ -23,14 +23,12 @@ be mounted with siphash") Signed-off-by: Gabriel Krisman Bertazi Link: https://patch.msgid.link/87jzg1en6j.fsf_-_@mailhost.krisman.be Signed-off-by: Theodore Ts'o -[ The commit a2187431c395 intended to remove the if-block which was used - for an old SIPHASH rejection check. ] -Signed-off-by: Ankan Biswas +Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Greg Kroah-Hartman --- fs/ext4/ext4.h | 1 + - fs/ext4/super.c | 20 +++++++++++++++++--- - 2 files changed, 18 insertions(+), 3 deletions(-) + fs/ext4/super.c | 28 +++++++++++++++++----------- + 2 files changed, 18 insertions(+), 11 deletions(-) --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -44,7 +42,22 @@ Signed-off-by: Greg Kroah-Hartman const void *address, unsigned int length) --- a/fs/ext4/super.c +++ b/fs/ext4/super.c -@@ -5140,16 +5140,27 @@ out: +@@ -3632,14 +3632,6 @@ 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; + +@@ -5148,16 +5140,27 @@ out: return ret; } @@ -74,7 +87,7 @@ Signed-off-by: Greg Kroah-Hartman if (ext4_has_feature_dir_index(sb)) { i = le32_to_cpu(es->s_flags); if (i & EXT2_FLAGS_UNSIGNED_HASH) -@@ -5167,6 +5178,7 @@ static void ext4_hash_info_init(struct s +@@ -5175,6 +5178,7 @@ static void ext4_hash_info_init(struct s #endif } } @@ -82,7 +95,7 @@ Signed-off-by: Greg Kroah-Hartman } static int ext4_block_group_meta_init(struct super_block *sb, int silent) -@@ -5311,7 +5323,9 @@ static int __ext4_fill_super(struct fs_c +@@ -5319,7 +5323,9 @@ static int __ext4_fill_super(struct fs_c if (err) goto failed_mount; diff --git a/queue-6.6/series b/queue-6.6/series index 023c5dfb8a..0104a11838 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -672,7 +672,6 @@ net-remove-rtnl-dance-for-siocbraddif-and-siocbrdelif.patch drm-amd-display-fix-null-pointer-deref-in-dcn20_resource.c.patch loongarch-refactor-register-restoration-in-ftrace_common_return.patch powerpc-64s-radix-kfence-map-__kfence_pool-at-page-granularity.patch -ext4-fix-error-message-when-rejecting-the-default-hash.patch ext4-introduce-itail-helper.patch ext4-fix-out-of-bound-read-in-ext4_xattr_inode_dec_ref_all.patch xfrm-state-fix-out-of-bounds-read-during-lookup.patch @@ -728,10 +727,11 @@ mm-damon-tests-core-kunit-handle-alloc-failures-in-damon_test_ops_registration.p mm-damon-tests-core-kunit-handle-alloc-failure-on-damon_test_set_attrs.patch mm-damon-tests-core-kunit-handle-alloc-failures-in-damon_test_update_monitoring_result.patch virtio_console-fix-order-of-fields-cols-and-rows.patch -ext4-filesystems-without-casefold-feature-cannot-be-mounted-with-siphash.patch net-stmmac-make-sure-that-ptp_rate-is-not-0-before-configuring-est.patch pwm-stm32-always-program-polarity.patch blk-mq-setup-queue-tag_set-before-initializing-hctx.patch tty-fix-tty_port_tty_-hangup-kernel-doc.patch firmware-arm_scmi-fix-unused-notifier-block-in-unregister.patch revert-iommu-amd-skip-enabling-command-event-buffers-for-kdump.patch +ext4-filesystems-without-casefold-feature-cannot-be-mounted-with-siphash.patch +ext4-fix-error-message-when-rejecting-the-default-hash.patch