From: Guenter Roeck <linux@roeck-us.net>
To: David Gow <davidgow@google.com>
Cc: "Linus Torvalds" <torvalds@linux-foundation.org>,
"Shuah Khan" <skhan@linuxfoundation.org>,
"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>,
"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: Re: [PATCH 9/9] kunit: Annotate _MSG assertion variants with gnu printf specifiers
Date: Wed, 21 Feb 2024 05:26:45 -0800 [thread overview]
Message-ID: <678b4b1b-6319-448b-b6a7-7692b368bf31@roeck-us.net> (raw)
In-Reply-To: <20240221092728.1281499-10-davidgow@google.com>
On Wed, Feb 21, 2024 at 05:27:22PM +0800, David Gow wrote:
> KUnit's assertion macros have variants which accept a printf format
> string, to allow tests to specify a more detailed message on failure.
> These (and the related KUNIT_FAIL() macro) ultimately wrap the
> __kunit_do_failed_assertion() function, which accepted a printf format
> specifier, but did not have the __printf attribute, so gcc couldn't warn
> on incorrect agruments.
>
> It turns out there were quite a few tests with such incorrect arguments.
>
> Add the __printf() specifier now that we've fixed these errors, to
> prevent them from recurring.
>
> Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
> Signed-off-by: David Gow <davidgow@google.com>
Tested-by: Guenter Roeck <linux@roeck-us.net>
> ---
> include/kunit/test.h | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/include/kunit/test.h b/include/kunit/test.h
> index fcb4a4940ace..61637ef32302 100644
> --- a/include/kunit/test.h
> +++ b/include/kunit/test.h
> @@ -579,12 +579,12 @@ void __printf(2, 3) kunit_log_append(struct string_stream *log, const char *fmt,
>
> void __noreturn __kunit_abort(struct kunit *test);
>
> -void __kunit_do_failed_assertion(struct kunit *test,
> - const struct kunit_loc *loc,
> - enum kunit_assert_type type,
> - const struct kunit_assert *assert,
> - assert_format_t assert_format,
> - const char *fmt, ...);
> +void __printf(6, 7) __kunit_do_failed_assertion(struct kunit *test,
> + const struct kunit_loc *loc,
> + enum kunit_assert_type type,
> + const struct kunit_assert *assert,
> + assert_format_t assert_format,
> + const char *fmt, ...);
>
> #define _KUNIT_FAILED(test, assert_type, assert_class, assert_format, INITIALIZER, fmt, ...) do { \
> static const struct kunit_loc __loc = KUNIT_CURRENT_LOC; \
> --
> 2.44.0.rc0.258.g7320e95886-goog
>
next prev parent reply other threads:[~2024-02-21 13:26 UTC|newest]
Thread overview: 46+ 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 ` [PATCH 3/9] lib: memcpy_kunit: " David Gow
2024-02-21 13:25 ` 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 18:21 ` [tip: timers/core] time/kunit: Use correct " tip-bot2 for David Gow
2024-02-23 7:01 ` David Gow
2024-02-23 23:06 ` Shuah Khan
2024-02-21 21:06 ` [PATCH 4/9] time: test: Fix incorrect " 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 [this message]
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=678b4b1b-6319-448b-b6a7-7692b368bf31@roeck-us.net \
--to=linux@roeck-us.net \
--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=davidgow@google.com \
--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=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).