kunit: Protect KUNIT_BINARY_STR_ASSERTION against ERR_PTR values

Replace the NULL checks with IS_ERR_OR_NULL() in
KUNIT_BINARY_STR_ASSERTION() to prevent the strcmp() faulting if a
passed pointer is an ERR_PTR.

Commit 7ece381aa72d4 ("kunit: Protect string comparisons against NULL")
added the checks for NULL on both pointers so that asserts would fail,
instead of faulting, if either pointer is NULL. But either pointer
could hold an ERR_PTR value.

This assumes that the assertion is expecting both strings to be valid,
and is asserting the equality of their _content_.

Link: https://lore.kernel.org/r/20251219161212.1648076-1-rf@opensource.cirrus.com
Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Reviewed-by: David Gow <davidgow@google.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>

diff --git a/include/kunit/test.h b/include/kunit/test.h
index 5ec5182b5e5751751045269e14150c7c96ddc06f..9cd1594ab697d99c1a7395712441fe9ad642de5d 100644 (file)
--- a/include/kunit/test.h
+++ b/include/kunit/test.h
@@ -906,7 +906,8 @@ do {                                                                               \
        };                                                                     \
                                                                               \
        _KUNIT_SAVE_LOC(test);                                                 \
-       if (likely((__left) && (__right) && (strcmp(__left, __right) op 0)))   \
+       if (likely(!IS_ERR_OR_NULL(__left) && !IS_ERR_OR_NULL(__right) &&      \
+           (strcmp(__left, __right) op 0)))                                   \
                break;                                                         \
                                                                               \
                                                                               \