From: David Gow <davidgow@google.com>
To: "Linus Torvalds" <torvalds@linux-foundation.org>,
"Shuah Khan" <skhan@linuxfoundation.org>,
"Guenter Roeck" <linux@roeck-us.net>,
"Rae Moar" <rmoar@google.com>,
"Matthew Auld" <matthew.auld@intel.com>,
"Arunpravin Paneer Selvam" <arunpravin.paneerselvam@amd.com>,
"Christian König" <christian.koenig@amd.com>,
"Kees Cook" <keescook@chromium.org>,
"Maíra Canal" <mcanal@igalia.com>,
"Rodrigo Vivi" <rodrigo.vivi@intel.com>,
"Matthew Brost" <matthew.brost@intel.com>,
"Willem de Bruijn" <willemb@google.com>,
"Florian Westphal" <fw@strlen.de>,
"Cassio Neri" <cassio.neri@gmail.com>,
"Javier Martinez Canillas" <javierm@redhat.com>,
"Arthur Grillo" <arthur.grillo@usp.br>
Cc: David Gow <davidgow@google.com>,
Brendan Higgins <brendan.higgins@linux.dev>,
Daniel Latypov <dlatypov@google.com>,
Stephen Boyd <sboyd@kernel.org>, David Airlie <airlied@gmail.com>,
Maxime Ripard <mripard@kernel.org>,
"David S . Miller" <davem@davemloft.net>,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
intel-xe@lists.freedesktop.org, linux-rtc@vger.kernel.org,
linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com,
linux-hardening@vger.kernel.org, netdev@vger.kernel.org
Subject: [PATCH 3/9] lib: memcpy_kunit: Fix an invalid format specifier in an assertion msg
Date: Wed, 21 Feb 2024 17:27:16 +0800 [thread overview]
Message-ID: <20240221092728.1281499-4-davidgow@google.com> (raw)
In-Reply-To: <20240221092728.1281499-1-davidgow@google.com>
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>
---
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
next prev parent reply other threads:[~2024-02-21 9:28 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-21 9:27 [PATCH 0/9] kunit: Fix printf format specifier issues in KUnit assertions David Gow
2024-02-21 9:27 ` [PATCH 1/9] kunit: test: Log the correct filter string in executor_test David Gow
2024-02-21 13:25 ` Guenter Roeck
2024-02-21 20:04 ` Justin Stitt
2024-02-21 20:29 ` Daniel Latypov
2024-02-22 20:58 ` Rae Moar
2024-02-21 9:27 ` [PATCH 2/9] lib/cmdline: Fix an invalid format specifier in an assertion msg David Gow
2024-02-21 13:25 ` Guenter Roeck
2024-02-21 20:10 ` Justin Stitt
2024-02-22 6:22 ` David Gow
2024-02-22 17:36 ` Daniel Latypov
2024-02-22 17:56 ` Linus Torvalds
2024-02-21 9:27 ` David Gow [this message]
2024-02-21 13:25 ` [PATCH 3/9] lib: memcpy_kunit: " Guenter Roeck
2024-02-21 21:05 ` Justin Stitt
2024-02-21 9:27 ` [PATCH 4/9] time: test: Fix incorrect format specifier David Gow
2024-02-21 13:25 ` Guenter Roeck
2024-02-21 21:06 ` Justin Stitt
2024-02-21 9:27 ` [PATCH 5/9] rtc: test: Fix invalid " David Gow
2024-02-21 13:26 ` Guenter Roeck
2024-02-21 21:06 ` Justin Stitt
2024-02-27 20:32 ` Alexandre Belloni
2024-02-27 21:23 ` Shuah Khan
2024-02-27 22:48 ` Alexandre Belloni
2024-02-21 9:27 ` [PATCH 6/9] net: test: Fix printf format specifier in skb_segment kunit test David Gow
2024-02-21 13:26 ` Guenter Roeck
2024-02-21 21:26 ` Justin Stitt
2024-02-21 9:27 ` [PATCH 7/9] drm: tests: Fix invalid printf format specifiers in KUnit tests David Gow
2024-02-21 10:21 ` Matthew Auld
2024-02-21 10:45 ` Christian König
2024-02-21 13:26 ` Guenter Roeck
2024-02-21 21:29 ` Justin Stitt
2024-02-27 23:24 ` Shuah Khan
2024-02-21 9:27 ` [PATCH 8/9] drm/xe/tests: Fix printf format specifiers in xe_migrate test David Gow
2024-02-21 13:26 ` Guenter Roeck
2024-02-22 5:05 ` Lucas De Marchi
2024-02-22 5:59 ` Linus Torvalds
2024-02-22 9:52 ` Thomas Hellström
2024-02-21 9:27 ` [PATCH 9/9] kunit: Annotate _MSG assertion variants with gnu printf specifiers David Gow
2024-02-21 13:26 ` Guenter Roeck
2024-02-21 20:02 ` Justin Stitt
2024-02-22 14:23 ` [PATCH 0/9] kunit: Fix printf format specifier issues in KUnit assertions Shuah Khan
2024-02-27 23:32 ` Shuah Khan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240221092728.1281499-4-davidgow@google.com \
--to=davidgow@google.com \
--cc=airlied@gmail.com \
--cc=arthur.grillo@usp.br \
--cc=arunpravin.paneerselvam@amd.com \
--cc=brendan.higgins@linux.dev \
--cc=cassio.neri@gmail.com \
--cc=christian.koenig@amd.com \
--cc=davem@davemloft.net \
--cc=dlatypov@google.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=fw@strlen.de \
--cc=intel-xe@lists.freedesktop.org \
--cc=javierm@redhat.com \
--cc=keescook@chromium.org \
--cc=kunit-dev@googlegroups.com \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-rtc@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=matthew.auld@intel.com \
--cc=matthew.brost@intel.com \
--cc=mcanal@igalia.com \
--cc=mripard@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=rmoar@google.com \
--cc=rodrigo.vivi@intel.com \
--cc=sboyd@kernel.org \
--cc=skhan@linuxfoundation.org \
--cc=torvalds@linux-foundation.org \
--cc=willemb@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).