diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-10-24 12:19:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-10-24 12:19:34 -0700 |
| commit | 2a91e897c0e199f5d4cdc1a15f948133b15ec1f3 (patch) | |
| tree | 93a38a63ab347bf5e3392c38a53deb97c187a0c4 | |
| parent | 21c92498e9b86b5b3e91818e13ce7943da8496a4 (diff) | |
| parent | 618887768bb71f0a475334fa5a4fba7dc98d7ab5 (diff) | |
| download | lwn-2a91e897c0e199f5d4cdc1a15f948133b15ec1f3.tar.gz lwn-2a91e897c0e199f5d4cdc1a15f948133b15ec1f3.zip | |
Merge tag 'linux-kselftest-kunit-fixes-6.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
Pull KUnit fixes from Shuah Khan:
"One single fix to update alloc_string_stream() callers to check for
IS_ERR() instead of NULL to be in sync with alloc_string_stream()
returning an ERR_PTR()"
* tag 'linux-kselftest-kunit-fixes-6.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
kunit: update NULL vs IS_ERR() tests
| -rw-r--r-- | lib/kunit/string-stream.c | 4 | ||||
| -rw-r--r-- | lib/kunit/test.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/kunit/string-stream.c b/lib/kunit/string-stream.c index f5ae79c37400..a608746020a9 100644 --- a/lib/kunit/string-stream.c +++ b/lib/kunit/string-stream.c @@ -56,8 +56,8 @@ int string_stream_vadd(struct string_stream *stream, frag_container = alloc_string_stream_fragment(stream->test, len, stream->gfp); - if (!frag_container) - return -ENOMEM; + if (IS_ERR(frag_container)) + return PTR_ERR(frag_container); len = vsnprintf(frag_container->fragment, len, fmt, args); spin_lock(&stream->lock); diff --git a/lib/kunit/test.c b/lib/kunit/test.c index 90640a43cf62..2a6992fe7c3e 100644 --- a/lib/kunit/test.c +++ b/lib/kunit/test.c @@ -265,7 +265,7 @@ static void kunit_fail(struct kunit *test, const struct kunit_loc *loc, kunit_set_failure(test); stream = alloc_string_stream(test, GFP_KERNEL); - if (!stream) { + if (IS_ERR(stream)) { WARN(true, "Could not allocate stream to print failed assertion in %s:%d\n", loc->file, |