Re: [PATCH 3/9] lib: memcpy_kunit: Fix an invalid format specifier in an assertion msg

Guenter Roeck
2024-02-21T13:25:49Z

On Wed, Feb 21, 2024 at 05:27:16PM +0800, David Gow wrote:
> The 'i' passed as an assertion message is a size_t, so should use '%zu',
> not '%d'.
>
> This was found by annotating the _MSG() variants of KUnit's assertions
> to let gcc validate the format strings.
>
> Fixes: bb95ebbe89a7 ("lib: Introduce CONFIG_MEMCPY_KUNIT_TEST")
> Signed-off-by: David Gow <davidgow@google.com>

Tested-by: Guenter Roeck <linux@roeck-us.net>

> ---
> lib/memcpy_kunit.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/lib/memcpy_kunit.c b/lib/memcpy_kunit.c
> index 440aee705ccc..30e00ef0bf2e 100644
> --- a/lib/memcpy_kunit.c
> +++ b/lib/memcpy_kunit.c
> @@ -32,7 +32,7 @@ struct some_bytes {
> BUILD_BUG_ON(sizeof(instance.data) != 32); \
> for (size_t i = 0; i < sizeof(instance.data); i++) { \
> KUNIT_ASSERT_EQ_MSG(test, instance.data[i], v, \
> - "line %d: '%s' not initialized to 0x%02x @ %d (saw 0x%02x)\n", \
> + "line %d: '%s' not initialized to 0x%02x @ %zu (saw 0x%02x)\n", \
> __LINE__, #instance, v, i, instance.data[i]); \
> } \
> } while (0)
> @@ -41,7 +41,7 @@ struct some_bytes {
> BUILD_BUG_ON(sizeof(one) != sizeof(two)); \
> for (size_t i = 0; i < sizeof(one); i++) { \
> KUNIT_EXPECT_EQ_MSG(test, one.data[i], two.data[i], \
> - "line %d: %s.data[%d] (0x%02x) != %s.data[%d] (0x%02x)\n", \
> + "line %d: %s.data[%zu] (0x%02x) != %s.data[%zu] (0x%02x)\n", \
> __LINE__, #one, i, one.data[i], #two, i, two.data[i]); \
> } \
> kunit_info(test, "ok: " TEST_OP "() " name "\n"); \
> --
> 2.44.0.rc0.258.g7320e95886-goog
>