From: shuah <shuah@kernel.org>
To: Aleksa Sarai <cyphar@cyphar.com>,
Al Viro <viro@zeniv.linux.org.uk>,
Jeff Layton <jlayton@kernel.org>,
"J. Bruce Fields" <bfields@fieldses.org>,
Arnd Bergmann <arnd@arndb.de>,
David Howells <dhowells@redhat.com>,
Shuah Khan <skhan@linuxfoundation.org>
Cc: Eric Biederman <ebiederm@xmission.com>,
Andy Lutomirski <luto@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Alexei Starovoitov <ast@kernel.org>,
Kees Cook <keescook@chromium.org>, Jann Horn <jannh@google.com>,
Christian Brauner <christian@brauner.io>,
Tycho Andersen <tycho@tycho.ws>,
David Drysdale <drysdale@google.com>,
Chanho Min <chanho.min@lge.com>, Oleg Nesterov <oleg@redhat.com>,
Aleksa Sarai <asarai@suse.de>,
Linus Torvalds <torvalds@linux-foundation.org>,
containers@lists.linux-foundation.org,
linux-alpha@vger.kernel.org, linux-api@vger.kernel.org,
linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-fsdevel@vger.kernel.org, linux-ia64@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org,
linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org,
linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
linux-s390@vger.kernel.org, linux-sh@vger.kernel.org,
linux-xtensa@linux-xtensa.org, sparclinux@vger.kernel.org,
shuah <shuah@kernel.org>
Subject: Re: [PATCH v10 8/9] kselftest: save-and-restore errno to allow for %m formatting
Date: Fri, 19 Jul 2019 16:25:46 -0600 [thread overview]
Message-ID: <b32d95a1-8a49-65ef-4ddd-fe86a7ca01d5@kernel.org> (raw)
In-Reply-To: <20190719164225.27083-9-cyphar@cyphar.com>
On 7/19/19 10:42 AM, Aleksa Sarai wrote:
> 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>
> ---
> tools/testing/selftests/kselftest.h | 15 +++++++++++++++
> 1 file changed, 15 insertions(+)
>
> diff --git a/tools/testing/selftests/kselftest.h b/tools/testing/selftests/kselftest.h
> index ec15c4f6af55..0ac49d91a260 100644
> --- a/tools/testing/selftests/kselftest.h
> +++ b/tools/testing/selftests/kselftest.h
> @@ -10,6 +10,7 @@
> #ifndef __KSELFTEST_H
> #define __KSELFTEST_H
>
> +#include <errno.h>
> #include <stdlib.h>
> #include <unistd.h>
> #include <stdarg.h>
> @@ -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);
> }
> @@ -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);
>
> @@ -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 {
>
Hi Aleksa,
Can you send this patch separate from the patch series. I will apply
this as bug fix to 5.3-rc2 or rc3.
This isn't part of this series anyway and I would like to get this in
right away.
thanks,
-- Shuah
next prev parent reply other threads:[~2019-07-19 22:25 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-19 16:42 [PATCH v10 0/9] namei: openat2(2) path resolution restrictions Aleksa Sarai
2019-07-19 16:42 ` [PATCH v10 1/9] namei: obey trailing magic-link DAC permissions Aleksa Sarai
2019-07-19 16:42 ` [PATCH v10 2/9] procfs: switch magic-link modes to be more sane Aleksa Sarai
2019-07-19 16:42 ` [PATCH v10 3/9] open: O_EMPTYPATH: procfs-less file descriptor re-opening Aleksa Sarai
2019-07-19 16:42 ` [PATCH v10 4/9] namei: O_BENEATH-style path resolution flags Aleksa Sarai
2019-07-19 16:42 ` [PATCH v10 5/9] namei: LOOKUP_IN_ROOT: chroot-like path resolution Aleksa Sarai
2019-07-19 16:42 ` [PATCH v10 6/9] namei: aggressively check for nd->root escape on ".." resolution Aleksa Sarai
2019-07-19 16:42 ` [PATCH v10 7/9] open: openat2(2) syscall Aleksa Sarai
2019-07-19 16:42 ` [PATCH v10 8/9] kselftest: save-and-restore errno to allow for %m formatting Aleksa Sarai
2019-07-19 22:25 ` shuah [this message]
2019-07-20 0:03 ` [PATCH] " Aleksa Sarai
2019-07-20 0:09 ` [PATCH v10 8/9] " Aleksa Sarai
2019-07-19 16:42 ` [PATCH v10 9/9] selftests: add openat2(2) selftests Aleksa Sarai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b32d95a1-8a49-65ef-4ddd-fe86a7ca01d5@kernel.org \
--to=shuah@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=asarai@suse.de \
--cc=ast@kernel.org \
--cc=bfields@fieldses.org \
--cc=chanho.min@lge.com \
--cc=christian@brauner.io \
--cc=containers@lists.linux-foundation.org \
--cc=cyphar@cyphar.com \
--cc=dhowells@redhat.com \
--cc=drysdale@google.com \
--cc=ebiederm@xmission.com \
--cc=jannh@google.com \
--cc=jlayton@kernel.org \
--cc=keescook@chromium.org \
--cc=linux-alpha@vger.kernel.org \
--cc=linux-api@vger.kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-parisc@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=linux-xtensa@linux-xtensa.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=luto@kernel.org \
--cc=oleg@redhat.com \
--cc=skhan@linuxfoundation.org \
--cc=sparclinux@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=tycho@tycho.ws \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).