Received-SPF: pass (google.com: domain of linux-kernel+bounces-13350-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Message-ID: <f80fafaf-41b2-4b69-a574-424c9de18fd9@collabora.com>
Date: Sat, 30 Dec 2023 12:17:49 +0500
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Cc: Muhammad Usama Anjum <usama.anjum@collabora.com>,
 linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com,
 linux-kernel@vger.kernel.org, patches@opensource.cirrus.com
Subject: Re: [PATCH] kunit: Protect string comparisons against NULL
Content-Language: en-US
To: Richard Fitzgerald <rf@opensource.cirrus.com>, brendan.higgins@linux.dev,
 davidgow@google.com, rmoar@google.com
References: <20231220155256.407974-1-rf@opensource.cirrus.com>
From: Muhammad Usama Anjum <usama.anjum@collabora.com>
In-Reply-To: <20231220155256.407974-1-rf@opensource.cirrus.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit

On 12/20/23 8:52 PM, Richard Fitzgerald wrote:
> Add NULL checks to KUNIT_BINARY_STR_ASSERTION() so that it will fail
> cleanly if either pointer is NULL, instead of causing a NULL pointer
> dereference in the strcmp().
> 
> A test failure could be that a string is unexpectedly NULL. This could
> be trapped by KUNIT_ASSERT_NOT_NULL() but that would terminate the test
> at that point. It's preferable that the KUNIT_EXPECT_STR*() macros can
> handle NULL pointers as a failure.
> 
> Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Reviewed-by: Muhammad Usama Anjum <usama.anjum@collabora.com>

> ---
>  include/kunit/test.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/kunit/test.h b/include/kunit/test.h
> index b163b9984b33..c2ce379c329b 100644
> --- a/include/kunit/test.h
> +++ b/include/kunit/test.h
> @@ -758,7 +758,7 @@ do {									       \
>  		.right_text = #right,					       \
>  	};								       \
>  									       \
> -	if (likely(strcmp(__left, __right) op 0))			       \
> +	if (likely((__left) && (__right) && (strcmp(__left, __right) op 0)))   \
>  		break;							       \
>  									       \
>  									       \

-- 
BR,
Muhammad Usama Anjum