summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorYoungJun.park <her0gyugyu@gmail.com>2022-10-28 07:42:41 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-01-12 12:02:41 +0100
commit84cc257e1888862e3018db2c402b44b8915c1eb1 (patch)
treebbb806e9ecef9d853dcb1bd933f8859f50d334a9 /lib
parent8b2de52126612b6d99f637292fc3aaceb42efc8a (diff)
downloadlinux-84cc257e1888862e3018db2c402b44b8915c1eb1.tar.gz
linux-84cc257e1888862e3018db2c402b44b8915c1eb1.tar.bz2
linux-84cc257e1888862e3018db2c402b44b8915c1eb1.zip
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@linuxfoundation.org> Signed-off-by: YoungJun.park <her0gyugyu@gmail.com> Reviewed-by: David Gow <davidgow@google.com> Signed-off-by: Shuah Khan <skhan@linuxfoundation.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/kunit/string-stream.c4
1 files changed, 3 insertions, 1 deletions
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;
}