6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Safonov 0x7f454c46@gmail.com
[ Upstream commit b476c93654d748c13624f7c7d0ba191c56a8092e ]
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 Reported-by: Muhammad Usama Anjum usama.anjum@collabora.com Signed-off-by: Paolo Abeni pabeni@redhat.com Signed-off-by: Sasha Levin sashal@kernel.org --- tools/testing/selftests/net/tcp_ao/lib/setup.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/tools/testing/selftests/net/tcp_ao/lib/setup.c b/tools/testing/selftests/net/tcp_ao/lib/setup.c index 92276f916f2f3..e408b9243b2c5 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); }