Patch "kunit: alloc_string_stream_fragment error handling bug fix" has been added to the 6.1-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

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

    kunit: alloc_string_stream_fragment error handling bug fix

to the 6.1-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:
     kunit-alloc_string_stream_fragment-error-handling-bu.patch
and it can be found in the queue-6.1 subdirectory.

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



commit ff721f4ccf263a3265125ecc219a588e6f3895e3
Author: YoungJun.park <her0gyugyu@xxxxxxxxx>
Date:   Fri Oct 28 07:42:41 2022 -0700

    kunit: alloc_string_stream_fragment error handling bug fix
    
    [ Upstream commit 93ef83050e597634d2c7dc838a28caf5137b9404 ]
    
    When it fails to allocate fragment, it does not free and return error.
    And check the pointer inappropriately.
    
    Fixed merge conflicts with
    commit 618887768bb7 ("kunit: update NULL vs IS_ERR() tests")
    Shuah Khan <skhan@xxxxxxxxxxxxxxxxxxx>
    
    Signed-off-by: YoungJun.park <her0gyugyu@xxxxxxxxx>
    Reviewed-by: David Gow <davidgow@xxxxxxxxxx>
    Signed-off-by: Shuah Khan <skhan@xxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/lib/kunit/string-stream.c b/lib/kunit/string-stream.c
index a608746020a9..7aeabe1a3dc5 100644
--- a/lib/kunit/string-stream.c
+++ b/lib/kunit/string-stream.c
@@ -23,8 +23,10 @@ static struct string_stream_fragment *alloc_string_stream_fragment(
 		return ERR_PTR(-ENOMEM);
 
 	frag->fragment = kunit_kmalloc(test, len, gfp);
-	if (!frag->fragment)
+	if (!frag->fragment) {
+		kunit_kfree(test, frag);
 		return ERR_PTR(-ENOMEM);
+	}
 
 	return frag;
 }