Patch "string: Prepare to merge strcat KUnit tests into string_kunit.c" has been added to the 6.9-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    string: Prepare to merge strcat KUnit tests into string_kunit.c

to the 6.9-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     string-prepare-to-merge-strcat-kunit-tests-into-stri.patch
and it can be found in the queue-6.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit d95f5c07c4fdf467ae32a8587c5bd0d71c277a9f
Author: Kees Cook <keescook@xxxxxxxxxxxx>
Date:   Fri Apr 19 07:01:52 2024 -0700

    string: Prepare to merge strcat KUnit tests into string_kunit.c
    
    [ Upstream commit 6e4ef1429f3be236e145c6115b539acdbd2e299c ]
    
    The test naming convention differs between string_kunit.c and
    strcat_kunit.c. Move "test" to the beginning of the function name.
    
    Reviewed-by: Andy Shevchenko <andy.shevchenko@xxxxxxxxx>
    Tested-by: Ivan Orlov <ivan.orlov0322@xxxxxxxxx>
    Link: https://lore.kernel.org/r/20240419140155.3028912-3-keescook@xxxxxxxxxxxx
    Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx>
    Stable-dep-of: 5bb288c4abc2 ("scsi: mptfusion: Avoid possible run-time warning with long manufacturer strings")
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/lib/strcat_kunit.c b/lib/strcat_kunit.c
index e21be95514afa..ca09f7f0e6a26 100644
--- a/lib/strcat_kunit.c
+++ b/lib/strcat_kunit.c
@@ -10,7 +10,7 @@
 
 static volatile int unconst;
 
-static void strcat_test(struct kunit *test)
+static void test_strcat(struct kunit *test)
 {
 	char dest[8];
 
@@ -29,7 +29,7 @@ static void strcat_test(struct kunit *test)
 	KUNIT_EXPECT_STREQ(test, dest, "fourAB");
 }
 
-static void strncat_test(struct kunit *test)
+static void test_strncat(struct kunit *test)
 {
 	char dest[8];
 
@@ -56,7 +56,7 @@ static void strncat_test(struct kunit *test)
 	KUNIT_EXPECT_STREQ(test, dest, "fourAB");
 }
 
-static void strlcat_test(struct kunit *test)
+static void test_strlcat(struct kunit *test)
 {
 	char dest[8] = "";
 	int len = sizeof(dest) + unconst;
@@ -88,9 +88,9 @@ static void strlcat_test(struct kunit *test)
 }
 
 static struct kunit_case strcat_test_cases[] = {
-	KUNIT_CASE(strcat_test),
-	KUNIT_CASE(strncat_test),
-	KUNIT_CASE(strlcat_test),
+	KUNIT_CASE(test_strcat),
+	KUNIT_CASE(test_strncat),
+	KUNIT_CASE(test_strlcat),
 	{}
 };