Message ID | 20240413-tcp-ao-selftests-fixes-v1-4-f9c41c96949d@gmail.com (mailing list archive) |
---|---|
State | Accepted |
Commit | b476c93654d748c13624f7c7d0ba191c56a8092e |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | selftests/net/tcp_ao: A bunch of fixes for TCP-AO selftests | expand |
On Sat, 13 Apr 2024 at 02:43, Dmitry Safonov via B4 Relay <devnull+0x7f454c46.gmail.com@kernel.org> wrote: > > From: Dmitry Safonov <0x7f454c46@gmail.com> > > On my new laptop with packages from nixos-unstable, gcc 12.3.0 produces > > lib/setup.c: In function ‘__test_msg’: > > lib/setup.c:20:9: error: format not a string literal and no format arguments [-Werror=format-security] > > 20 | ksft_print_msg(buf); > > | ^~~~~~~~~~~~~~ > > lib/setup.c: In function ‘__test_ok’: > > lib/setup.c:26:9: error: format not a string literal and no format arguments [-Werror=format-security] > > 26 | ksft_test_result_pass(buf); > > | ^~~~~~~~~~~~~~~~~~~~~ > > lib/setup.c: In function ‘__test_fail’: > > lib/setup.c:32:9: error: format not a string literal and no format arguments [-Werror=format-security] > > 32 | ksft_test_result_fail(buf); > > | ^~~~~~~~~~~~~~~~~~~~~ > > lib/setup.c: In function ‘__test_xfail’: > > lib/setup.c:38:9: error: format not a string literal and no format arguments [-Werror=format-security] > > 38 | ksft_test_result_xfail(buf); > > | ^~~~~~~~~~~~~~~~~~~~~~ > > lib/setup.c: In function ‘__test_error’: > > lib/setup.c:44:9: error: format not a string literal and no format arguments [-Werror=format-security] > > 44 | ksft_test_result_error(buf); > > | ^~~~~~~~~~~~~~~~~~~~~~ > > lib/setup.c: In function ‘__test_skip’: > > lib/setup.c:50:9: error: format not a string literal and no format arguments [-Werror=format-security] > > 50 | ksft_test_result_skip(buf); > > | ^~~~~~~~~~~~~~~~~~~~~ > > cc1: some warnings being treated as errors > > As the buffer was already pre-printed into, print it as a string > rather than a format-string. > > Fixes: cfbab37b3da0 ("selftests/net: Add TCP-AO library") > Signed-off-by: Dmitry Safonov <0x7f454c46@gmail.com> And this one as well, Reported-by: Muhammad Usama Anjum <usama.anjum@collabora.com> Link: https://lore.kernel.org/all/0c6d4f0d-2064-4444-986b-1d1ed782135f@collabora.com/
diff --git a/tools/testing/selftests/net/tcp_ao/lib/setup.c b/tools/testing/selftests/net/tcp_ao/lib/setup.c index 92276f916f2f..e408b9243b2c 100644 --- a/tools/testing/selftests/net/tcp_ao/lib/setup.c +++ b/tools/testing/selftests/net/tcp_ao/lib/setup.c @@ -17,37 +17,37 @@ static pthread_mutex_t ksft_print_lock = PTHREAD_MUTEX_INITIALIZER; void __test_msg(const char *buf) { pthread_mutex_lock(&ksft_print_lock); - ksft_print_msg(buf); + ksft_print_msg("%s", buf); pthread_mutex_unlock(&ksft_print_lock); } void __test_ok(const char *buf) { pthread_mutex_lock(&ksft_print_lock); - ksft_test_result_pass(buf); + ksft_test_result_pass("%s", buf); pthread_mutex_unlock(&ksft_print_lock); } void __test_fail(const char *buf) { pthread_mutex_lock(&ksft_print_lock); - ksft_test_result_fail(buf); + ksft_test_result_fail("%s", buf); pthread_mutex_unlock(&ksft_print_lock); } void __test_xfail(const char *buf) { pthread_mutex_lock(&ksft_print_lock); - ksft_test_result_xfail(buf); + ksft_test_result_xfail("%s", buf); pthread_mutex_unlock(&ksft_print_lock); } void __test_error(const char *buf) { pthread_mutex_lock(&ksft_print_lock); - ksft_test_result_error(buf); + ksft_test_result_error("%s", buf); pthread_mutex_unlock(&ksft_print_lock); } void __test_skip(const char *buf) { pthread_mutex_lock(&ksft_print_lock); - ksft_test_result_skip(buf); + ksft_test_result_skip("%s", buf); pthread_mutex_unlock(&ksft_print_lock); }