public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kselftest: save-and-restore errno to allow for %m formatting

Browse source 
Previously, using "%m" in a ksft_* format string can result in strange
output because the errno value wasn't saved before calling other libc
functions. The solution is to simply save and restore the errno before
we format the user-supplied format string.

Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
This commit is contained in:
Aleksa Sarai 2019-07-20 10:03:32 +10:00 • committed by Shuah Khan
parent 527d37e9e5
commit fc2e634e99
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
tools/testing/selftests/kselftest.h
View file

@ -10,6 +10,7 @@
#ifndef __KSELFTEST_H #ifndef __KSELFTEST_H
#define __KSELFTEST_H #define __KSELFTEST_H
#include <errno.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <stdarg.h> #include <stdarg.h>
@ -81,58 +82,68 @@ static inline void ksft_print_cnts(void)
static inline void ksft_print_msg(const char *msg, ...) static inline void ksft_print_msg(const char *msg, ...)
{ {
int saved_errno = errno;
va_list args; va_list args;
va_start(args, msg); va_start(args, msg);
printf("# "); printf("# ");
errno = saved_errno;
vprintf(msg, args); vprintf(msg, args);
va_end(args); va_end(args);
} }
static inline void ksft_test_result_pass(const char *msg, ...) static inline void ksft_test_result_pass(const char *msg, ...)
{ {
int saved_errno = errno;
va_list args; va_list args;
ksft_cnt.ksft_pass++; ksft_cnt.ksft_pass++;
va_start(args, msg); va_start(args, msg);
printf("ok %d ", ksft_test_num()); printf("ok %d ", ksft_test_num());
errno = saved_errno;
vprintf(msg, args); vprintf(msg, args);
va_end(args); va_end(args);
} }
static inline void ksft_test_result_fail(const char *msg, ...) static inline void ksft_test_result_fail(const char *msg, ...)
{ {
int saved_errno = errno;
va_list args; va_list args;
ksft_cnt.ksft_fail++; ksft_cnt.ksft_fail++;
va_start(args, msg); va_start(args, msg);
printf("not ok %d ", ksft_test_num()); printf("not ok %d ", ksft_test_num());
errno = saved_errno;
vprintf(msg, args); vprintf(msg, args);
va_end(args); va_end(args);
} }
static inline void ksft_test_result_skip(const char *msg, ...) static inline void ksft_test_result_skip(const char *msg, ...)
{ {
int saved_errno = errno;
va_list args; va_list args;
ksft_cnt.ksft_xskip++; ksft_cnt.ksft_xskip++;
va_start(args, msg); va_start(args, msg);
printf("not ok %d # SKIP ", ksft_test_num()); printf("not ok %d # SKIP ", ksft_test_num());
errno = saved_errno;
vprintf(msg, args); vprintf(msg, args);
va_end(args); va_end(args);
} }
static inline void ksft_test_result_error(const char *msg, ...) static inline void ksft_test_result_error(const char *msg, ...)
{ {
int saved_errno = errno;
va_list args; va_list args;
ksft_cnt.ksft_error++; ksft_cnt.ksft_error++;
va_start(args, msg); va_start(args, msg);
printf("not ok %d # error ", ksft_test_num()); printf("not ok %d # error ", ksft_test_num());
errno = saved_errno;
vprintf(msg, args); vprintf(msg, args);
va_end(args); va_end(args);
} }
@ -152,10 +163,12 @@ static inline int ksft_exit_fail(void)
static inline int ksft_exit_fail_msg(const char *msg, ...) static inline int ksft_exit_fail_msg(const char *msg, ...)
{ {
int saved_errno = errno;
va_list args; va_list args;
va_start(args, msg); va_start(args, msg);
printf("Bail out! "); printf("Bail out! ");
errno = saved_errno;
vprintf(msg, args); vprintf(msg, args);
va_end(args); va_end(args);
@ -178,10 +191,12 @@ static inline int ksft_exit_xpass(void)
static inline int ksft_exit_skip(const char *msg, ...) static inline int ksft_exit_skip(const char *msg, ...)
{ {
if (msg) { if (msg) {
int saved_errno = errno;
va_list args; va_list args;
va_start(args, msg); va_start(args, msg);
printf("not ok %d # SKIP ", 1 + ksft_test_num()); printf("not ok %d # SKIP ", 1 + ksft_test_num());
errno = saved_errno;
vprintf(msg, args); vprintf(msg, args);
va_end(args); va_end(args);
} else { } else {