diff for duplicates of <20241118102050.16077-3-kovalev@altlinux.org> diff --git a/a/1.txt b/N1/1.txt index 3f5f9d3..44f0e55 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,37 +1,77 @@ -From: Lizhi Xu <lizhi.xu@windriver.com> +[ Sasha's backport helper bot ] -[ Upstream commit 985b67cd86392310d9e9326de941c22fc9340eec ] +Hi, -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. +The upstream commit SHA1 provided is correct: 985b67cd86392310d9e9326de941c22fc9340eec -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: Vasiliy Kovalev <kovalev@altlinux.org> +WARNING: Author mismatch between patch and upstream commit: +Backport author: Vasiliy Kovalev <kovalev@altlinux.org> +Commit author: Lizhi Xu <lizhi.xu@windriver.com> + +Commit in newer trees: + +|-----------------|----------------------------------------------| +| 6.11.y | Present (different SHA1: e1373903db6c) | +|-----------------|----------------------------------------------| + +Note: The patch differs from the upstream commit: --- - fs/ext4/super.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/fs/ext4/super.c b/fs/ext4/super.c -index cf2c8cf507780..68070b1859803 100644 ---- a/fs/ext4/super.c -+++ b/fs/ext4/super.c -@@ -3559,6 +3559,14 @@ int ext4_feature_set_ok(struct super_block *sb, int readonly) - } - #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; -+ } +--- - 2024-11-18 22:36:26.258041949 -0500 ++++ /tmp/tmp.H7dIMzFjni 2024-11-18 22:36:26.250299326 -0500 +@@ -1,3 +1,5 @@ ++[ Upstream commit 985b67cd86392310d9e9326de941c22fc9340eec ] + - if (readonly) - return 1; + 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. + +@@ -5,18 +7,19 @@ + 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: Vasiliy Kovalev <kovalev@altlinux.org> + --- +- fs/ext4/super.c | 7 +++++++ +- 1 file changed, 7 insertions(+) ++ fs/ext4/super.c | 8 ++++++++ ++ 1 file changed, 8 insertions(+) --- -2.33.8 + diff --git a/fs/ext4/super.c b/fs/ext4/super.c +-index e72145c4ae5a0..25cd0d662e31b 100644 ++index cf2c8cf507780..68070b1859803 100644 + --- a/fs/ext4/super.c + +++ b/fs/ext4/super.c +-@@ -3582,6 +3582,13 @@ int ext4_feature_set_ok(struct super_block *sb, int readonly) +- "mounted without CONFIG_UNICODE"); +- return 0; ++@@ -3559,6 +3559,14 @@ int ext4_feature_set_ok(struct super_block *sb, int readonly) + } ++ #endif ++ + + if (EXT4_SB(sb)->s_es->s_def_hash_version == DX_HASH_SIPHASH && + + !ext4_has_feature_casefold(sb)) { + + ext4_msg(sb, KERN_ERR, +@@ -24,6 +27,10 @@ + + "mounted with siphash"); + + return 0; + + } +- +++ + if (readonly) + return 1; ++ ++-- ++2.33.8 ++ +--- + +Results of testing on various branches: + +| Branch | Patch Apply | Build Test | +|---------------------------|-------------|------------| +| stable/linux-6.11.y | Failed (branch not found) | N/A | +| stable/linux-6.6.y | Failed (branch not found) | N/A | +| stable/linux-6.1.y | Failed (branch not found) | N/A | +| stable/linux-5.15.y | Failed (branch not found) | N/A | +| stable/linux-5.10.y | Failed (branch not found) | N/A | +| stable/linux-5.4.y | Failed (branch not found) | N/A | +| stable/linux-4.19.y | Failed (branch not found) | N/A | diff --git a/a/content_digest b/N1/content_digest index bd5e695..19c75d0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,52 +1,87 @@ - "ref\020241118102050.16077-1-kovalev@altlinux.org\0" - "From\0Vasiliy Kovalev <kovalev@altlinux.org>\0" - "Subject\0[PATCH 2/3] ext4: filesystems without casefold feature cannot be mounted with siphash\0" - "Date\0Mon, 18 Nov 2024 13:20:49 +0300\0" - "To\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>" - Sasha Levin <sashal@kernel.org> - " stable@vger.kernel.org\0" - "Cc\0lvc-project@linuxtesting.org" - dutyrok@altlinux.org - gerben@altlinux.org - " kovalev@altlinux.org\0" + "From\0Sasha Levin <sashal@kernel.org>\0" + "Subject\0Re: [PATCH 2/3] ext4: filesystems without casefold feature cannot be mounted with siphash\0" + "Date\0Mon, 18 Nov 2024 23:36:33 -0500\0" + "To\0stable@vger.kernel.org\0" + "Cc\0Vasiliy Kovalev <kovalev@altlinux.org>" + " Sasha Levin <sashal@kernel.org>\0" "\00:1\0" "b\0" - "From: Lizhi Xu <lizhi.xu@windriver.com>\n" + "[ Sasha's backport helper bot ]\n" "\n" - "[ Upstream commit 985b67cd86392310d9e9326de941c22fc9340eec ]\n" + "Hi,\n" "\n" - "When mounting the ext4 filesystem, if the default hash version is set to\n" - "DX_HASH_SIPHASH but the casefold feature is not set, exit the mounting.\n" + "The upstream commit SHA1 provided is correct: 985b67cd86392310d9e9326de941c22fc9340eec\n" "\n" - "Reported-by: syzbot+340581ba9dceb7e06fb3@syzkaller.appspotmail.com\n" - "Signed-off-by: Lizhi Xu <lizhi.xu@windriver.com>\n" - "Link: https://patch.msgid.link/20240605012335.44086-1-lizhi.xu@windriver.com\n" - "Signed-off-by: Theodore Ts'o <tytso@mit.edu>\n" - "Signed-off-by: Vasiliy Kovalev <kovalev@altlinux.org>\n" + "WARNING: Author mismatch between patch and upstream commit:\n" + "Backport author: Vasiliy Kovalev <kovalev@altlinux.org>\n" + "Commit author: Lizhi Xu <lizhi.xu@windriver.com>\n" + "\n" + "Commit in newer trees:\n" + "\n" + "|-----------------|----------------------------------------------|\n" + "| 6.11.y | Present (different SHA1: e1373903db6c) |\n" + "|-----------------|----------------------------------------------|\n" + "\n" + "Note: The patch differs from the upstream commit:\n" "---\n" - " fs/ext4/super.c | 8 ++++++++\n" - " 1 file changed, 8 insertions(+)\n" - "\n" - "diff --git a/fs/ext4/super.c b/fs/ext4/super.c\n" - "index cf2c8cf507780..68070b1859803 100644\n" - "--- a/fs/ext4/super.c\n" - "+++ b/fs/ext4/super.c\n" - "@@ -3559,6 +3559,14 @@ int ext4_feature_set_ok(struct super_block *sb, int readonly)\n" - " \t}\n" - " #endif\n" - " \n" - "+\tif (EXT4_SB(sb)->s_es->s_def_hash_version == DX_HASH_SIPHASH &&\n" - "+\t !ext4_has_feature_casefold(sb)) {\n" - "+\t\text4_msg(sb, KERN_ERR,\n" - "+\t\t\t \"Filesystem without casefold feature cannot be \"\n" - "+\t\t\t \"mounted with siphash\");\n" - "+\t\treturn 0;\n" - "+\t}\n" + "--- -\t2024-11-18 22:36:26.258041949 -0500\n" + "+++ /tmp/tmp.H7dIMzFjni\t2024-11-18 22:36:26.250299326 -0500\n" + "@@ -1,3 +1,5 @@\n" + "+[ Upstream commit 985b67cd86392310d9e9326de941c22fc9340eec ]\n" "+\n" - " \tif (readonly)\n" - " \t\treturn 1;\n" + " When mounting the ext4 filesystem, if the default hash version is set to\n" + " DX_HASH_SIPHASH but the casefold feature is not set, exit the mounting.\n" + " \n" + "@@ -5,18 +7,19 @@\n" + " Signed-off-by: Lizhi Xu <lizhi.xu@windriver.com>\n" + " Link: https://patch.msgid.link/20240605012335.44086-1-lizhi.xu@windriver.com\n" + " Signed-off-by: Theodore Ts'o <tytso@mit.edu>\n" + "+Signed-off-by: Vasiliy Kovalev <kovalev@altlinux.org>\n" + " ---\n" + "- fs/ext4/super.c | 7 +++++++\n" + "- 1 file changed, 7 insertions(+)\n" + "+ fs/ext4/super.c | 8 ++++++++\n" + "+ 1 file changed, 8 insertions(+)\n" " \n" - "-- \n" - 2.33.8 + " diff --git a/fs/ext4/super.c b/fs/ext4/super.c\n" + "-index e72145c4ae5a0..25cd0d662e31b 100644\n" + "+index cf2c8cf507780..68070b1859803 100644\n" + " --- a/fs/ext4/super.c\n" + " +++ b/fs/ext4/super.c\n" + "-@@ -3582,6 +3582,13 @@ int ext4_feature_set_ok(struct super_block *sb, int readonly)\n" + "- \t\t\t \"mounted without CONFIG_UNICODE\");\n" + "- \t\treturn 0;\n" + "+@@ -3559,6 +3559,14 @@ int ext4_feature_set_ok(struct super_block *sb, int readonly)\n" + " \t}\n" + "+ #endif\n" + "+ \n" + " +\tif (EXT4_SB(sb)->s_es->s_def_hash_version == DX_HASH_SIPHASH &&\n" + " +\t !ext4_has_feature_casefold(sb)) {\n" + " +\t\text4_msg(sb, KERN_ERR,\n" + "@@ -24,6 +27,10 @@\n" + " +\t\t\t \"mounted with siphash\");\n" + " +\t\treturn 0;\n" + " +\t}\n" + "- \n" + "++\n" + " \tif (readonly)\n" + " \t\treturn 1;\n" + "+ \n" + "+-- \n" + "+2.33.8\n" + "+\n" + "---\n" + "\n" + "Results of testing on various branches:\n" + "\n" + "| Branch | Patch Apply | Build Test |\n" + "|---------------------------|-------------|------------|\n" + "| stable/linux-6.11.y | Failed (branch not found) | N/A |\n" + "| stable/linux-6.6.y | Failed (branch not found) | N/A |\n" + "| stable/linux-6.1.y | Failed (branch not found) | N/A |\n" + "| stable/linux-5.15.y | Failed (branch not found) | N/A |\n" + "| stable/linux-5.10.y | Failed (branch not found) | N/A |\n" + "| stable/linux-5.4.y | Failed (branch not found) | N/A |\n" + | stable/linux-4.19.y | Failed (branch not found) | N/A | -c2490bf104d7ea2dba82eae2cd3505a7a5bbab8c37b0a9b8fc58878b112b4a24 +0d5d6d60699e1a6bd157879d6599140a8cbfb3774507ac20d8ac8624660d7b8c
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.