Commit b476c936 authored by Dmitry Safonov's avatar Dmitry Safonov Committed by Paolo Abeni

selftests/tcp_ao: Printing fixes to confirm with format-security

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: cfbab37b ("selftests/net: Add TCP-AO library")
Signed-off-by: default avatarDmitry Safonov <0x7f454c46@gmail.com>
Reported-by: default avatarMuhammad Usama Anjum <usama.anjum@collabora.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent beb78cd1
...@@ -17,37 +17,37 @@ static pthread_mutex_t ksft_print_lock = PTHREAD_MUTEX_INITIALIZER; ...@@ -17,37 +17,37 @@ static pthread_mutex_t ksft_print_lock = PTHREAD_MUTEX_INITIALIZER;
void __test_msg(const char *buf) void __test_msg(const char *buf)
{ {
pthread_mutex_lock(&ksft_print_lock); pthread_mutex_lock(&ksft_print_lock);
ksft_print_msg(buf); ksft_print_msg("%s", buf);
pthread_mutex_unlock(&ksft_print_lock); pthread_mutex_unlock(&ksft_print_lock);
} }
void __test_ok(const char *buf) void __test_ok(const char *buf)
{ {
pthread_mutex_lock(&ksft_print_lock); pthread_mutex_lock(&ksft_print_lock);
ksft_test_result_pass(buf); ksft_test_result_pass("%s", buf);
pthread_mutex_unlock(&ksft_print_lock); pthread_mutex_unlock(&ksft_print_lock);
} }
void __test_fail(const char *buf) void __test_fail(const char *buf)
{ {
pthread_mutex_lock(&ksft_print_lock); pthread_mutex_lock(&ksft_print_lock);
ksft_test_result_fail(buf); ksft_test_result_fail("%s", buf);
pthread_mutex_unlock(&ksft_print_lock); pthread_mutex_unlock(&ksft_print_lock);
} }
void __test_xfail(const char *buf) void __test_xfail(const char *buf)
{ {
pthread_mutex_lock(&ksft_print_lock); pthread_mutex_lock(&ksft_print_lock);
ksft_test_result_xfail(buf); ksft_test_result_xfail("%s", buf);
pthread_mutex_unlock(&ksft_print_lock); pthread_mutex_unlock(&ksft_print_lock);
} }
void __test_error(const char *buf) void __test_error(const char *buf)
{ {
pthread_mutex_lock(&ksft_print_lock); pthread_mutex_lock(&ksft_print_lock);
ksft_test_result_error(buf); ksft_test_result_error("%s", buf);
pthread_mutex_unlock(&ksft_print_lock); pthread_mutex_unlock(&ksft_print_lock);
} }
void __test_skip(const char *buf) void __test_skip(const char *buf)
{ {
pthread_mutex_lock(&ksft_print_lock); pthread_mutex_lock(&ksft_print_lock);
ksft_test_result_skip(buf); ksft_test_result_skip("%s", buf);
pthread_mutex_unlock(&ksft_print_lock); pthread_mutex_unlock(&ksft_print_lock);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment