Skip to content

Commit

Permalink
kselftest: save-and-restore errno to allow for %m formatting
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Aleksa Sarai authored and Shuah Khan committed Jul 30, 2019
1 parent 527d37e commit fc2e634
Showing 1 changed file with 15 additions and 0 deletions.
15 changes: 15 additions & 0 deletions tools/testing/selftests/kselftest.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#ifndef __KSELFTEST_H
#define __KSELFTEST_H

#include <errno.h>
#include <stdlib.h>
#include <unistd.h>
#include <stdarg.h>
Expand Down Expand Up @@ -81,58 +82,68 @@ static inline void ksft_print_cnts(void)

static inline void ksft_print_msg(const char *msg, ...)
{
int saved_errno = errno;
va_list args;

va_start(args, msg);
printf("# ");
errno = saved_errno;
vprintf(msg, args);
va_end(args);
}

static inline void ksft_test_result_pass(const char *msg, ...)
{
int saved_errno = errno;
va_list args;

ksft_cnt.ksft_pass++;

va_start(args, msg);
printf("ok %d ", ksft_test_num());
errno = saved_errno;
vprintf(msg, args);
va_end(args);
}

static inline void ksft_test_result_fail(const char *msg, ...)
{
int saved_errno = errno;
va_list args;

ksft_cnt.ksft_fail++;

va_start(args, msg);
printf("not ok %d ", ksft_test_num());
errno = saved_errno;
vprintf(msg, args);
va_end(args);
}

static inline void ksft_test_result_skip(const char *msg, ...)
{
int saved_errno = errno;
va_list args;

ksft_cnt.ksft_xskip++;

va_start(args, msg);
printf("not ok %d # SKIP ", ksft_test_num());
errno = saved_errno;
vprintf(msg, args);
va_end(args);
}

static inline void ksft_test_result_error(const char *msg, ...)
{
int saved_errno = errno;
va_list args;

ksft_cnt.ksft_error++;

va_start(args, msg);
printf("not ok %d # error ", ksft_test_num());
errno = saved_errno;
vprintf(msg, args);
va_end(args);
}
Expand All @@ -152,10 +163,12 @@ static inline int ksft_exit_fail(void)

static inline int ksft_exit_fail_msg(const char *msg, ...)
{
int saved_errno = errno;
va_list args;

va_start(args, msg);
printf("Bail out! ");
errno = saved_errno;
vprintf(msg, args);
va_end(args);

Expand All @@ -178,10 +191,12 @@ static inline int ksft_exit_xpass(void)
static inline int ksft_exit_skip(const char *msg, ...)
{
if (msg) {
int saved_errno = errno;
va_list args;

va_start(args, msg);
printf("not ok %d # SKIP ", 1 + ksft_test_num());
errno = saved_errno;
vprintf(msg, args);
va_end(args);
} else {
Expand Down

0 comments on commit fc2e634

Please sign in to comment.