From: "Eric W. Biederman" <ebiederm@xmission.com>
To: linux-kernel@vger.kernel.org
Cc: Andy Lutomirski <luto@kernel.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Al Viro <viro@zeniv.linux.org.uk>,
Oleg Nesterov <oleg@redhat.com>,
Andrei Vagin <avagin@virtuozzo.com>,
Thomas Gleixner <tglx@linutronix.de>, Greg KH <greg@kroah.com>,
Andrey Vagin <avagin@openvz.org>, Serge Hallyn <serge@hallyn.com>,
Pavel Emelyanov <xemul@virtuozzo.com>,
Cyrill Gorcunov <gorcunov@openvz.org>,
Peter Zijlstra <peterz@infradead.org>, Willy Tarreau <w@1wt.eu>,
linux-arch@vger.kernel.org, linux-api@vger.kernel.org,
Linux Containers <containers@lists.linux-foundation.org>,
Michael Kerrisk <mtk.manpages@gmail.com>,
"Eric W. Biederman" <ebiederm@xmission.com>,
Dave Hansen <dave.hansen@linux.intel.com>
Subject: [PATCH 5/7] signal/testing: Don't look for __SI_FAULT in userspace
Date: Tue, 18 Jul 2017 09:06:49 -0500 [thread overview]
Message-ID: <20170718140651.15973-5-ebiederm@xmission.com> (raw)
In-Reply-To: <87o9shg7t7.fsf_-_@xmission.com>
Fix the debug print statements in these tests where they reference
si_codes and in particular __SI_FAULT. __SI_FAULT is a kernel
internal value and should never be seen by userspace.
While I am in there also fix si_code_str. si_codes are an enumeration
there are not a bitmap so == and not & is the apropriate operation to
test for an si_code.
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Fixes: 5f23f6d082a9 ("x86/pkeys: Add self-tests")
Fixes: e754aedc26ef ("x86/mpx, selftests: Add MPX self test")
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
---
tools/testing/selftests/x86/mpx-mini-test.c | 3 +--
tools/testing/selftests/x86/protection_keys.c | 13 ++++++-------
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/tools/testing/selftests/x86/mpx-mini-test.c b/tools/testing/selftests/x86/mpx-mini-test.c
index a8df159a8924..ec0f6b45ce8b 100644
--- a/tools/testing/selftests/x86/mpx-mini-test.c
+++ b/tools/testing/selftests/x86/mpx-mini-test.c
@@ -391,8 +391,7 @@ void handler(int signum, siginfo_t *si, void *vucontext)
br_count++;
dprintf1("#BR 0x%jx (total seen: %d)\n", status, br_count);
-#define __SI_FAULT (3 << 16)
-#define SEGV_BNDERR (__SI_FAULT|3) /* failed address bound checks */
+#define SEGV_BNDERR 3 /* failed address bound checks */
dprintf2("Saw a #BR! status 0x%jx at %016lx br_reason: %jx\n",
status, ip, br_reason);
diff --git a/tools/testing/selftests/x86/protection_keys.c b/tools/testing/selftests/x86/protection_keys.c
index 3237bc010e1c..23927845518d 100644
--- a/tools/testing/selftests/x86/protection_keys.c
+++ b/tools/testing/selftests/x86/protection_keys.c
@@ -212,19 +212,18 @@ void dump_mem(void *dumpme, int len_bytes)
}
}
-#define __SI_FAULT (3 << 16)
-#define SEGV_BNDERR (__SI_FAULT|3) /* failed address bound checks */
-#define SEGV_PKUERR (__SI_FAULT|4)
+#define SEGV_BNDERR 3 /* failed address bound checks */
+#define SEGV_PKUERR 4
static char *si_code_str(int si_code)
{
- if (si_code & SEGV_MAPERR)
+ if (si_code == SEGV_MAPERR)
return "SEGV_MAPERR";
- if (si_code & SEGV_ACCERR)
+ if (si_code == SEGV_ACCERR)
return "SEGV_ACCERR";
- if (si_code & SEGV_BNDERR)
+ if (si_code == SEGV_BNDERR)
return "SEGV_BNDERR";
- if (si_code & SEGV_PKUERR)
+ if (si_code == SEGV_PKUERR)
return "SEGV_PKUERR";
return "UNKNOWN";
}
--
2.10.1
next prev parent reply other threads:[~2017-07-18 14:16 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <87lgot2loq.fsf@xmission.com>
[not found] ` <87zid90vye.fsf_-_@xmission.com>
[not found] ` <20170615225426.GP31671@ZenIV.linux.org.uk>
[not found] ` <87poe4zrs1.fsf@xmission.com>
[not found] ` <CA+55aFxpv+gchzs7AYgSC8feAOV=B6mjFgBVm4Kx+83J2CNE-w@mail.gmail.com>
[not found] ` <87poe3vsa9.fsf@xmission.com>
[not found] ` <CALCETrX=SquyR8JZqHDNx=_FQKQo-0u9AxfdUwJs_hujVO2A-g@mail.gmail.com>
[not found] ` <87h8zfua59.fsf@xmission.com>
[not found] ` <CALCETrWPBn31Dye=81r2ZMainNOnDy5c_QxbU2uRjnJs0ie=Zg@mail.gmail.com>
[not found] ` <87r2yjsuwl.fsf@xmission.com>
[not found] ` <20170616191602.GA10675@1wt.eu>
2017-06-30 12:36 ` [PATCH 0/8] signal: Fix sending signals with siginfo Eric W. Biederman
2017-07-18 14:04 ` [PATCH v2 0/7] " Eric W. Biederman
2017-07-18 14:06 ` [PATCH 1/7] signal/alpha: Document a conflict with SI_USER for SIGTRAP Eric W. Biederman
2017-07-18 18:22 ` Richard Henderson
2017-07-18 14:06 ` [PATCH 2/7] signal/ia64: Document a conflict with SI_USER with SIGFPE Eric W. Biederman
2017-07-18 14:06 ` [PATCH 3/7] signal/sparc: " Eric W. Biederman
2017-07-18 14:06 ` [PATCH 4/7] signal/mips: " Eric W. Biederman
2017-08-07 16:18 ` Maciej W. Rozycki
2017-08-07 17:41 ` Linus Torvalds
2017-08-07 19:55 ` Ralf Baechle
2017-08-08 15:29 ` Eric W. Biederman
2017-08-08 23:19 ` Maciej W. Rozycki
2017-07-18 14:06 ` Eric W. Biederman [this message]
2017-07-18 14:06 ` [PATCH 6/7] fcntl: Don't use ambiguous SIG_POLL si_codes Eric W. Biederman
2017-07-20 16:16 ` Oleg Nesterov
2017-07-21 2:33 ` Eric W. Biederman
2017-07-18 14:06 ` [PATCH 7/7] signal: Remove kernel interal si_code magic Eric W. Biederman
2017-07-18 16:57 ` Linus Torvalds
2017-07-18 17:27 ` Eric W. Biederman
2017-07-22 20:25 ` Simplfying copy_siginfo_to_user Eric W. Biederman
2017-07-24 17:43 ` Linus Torvalds
2017-07-24 19:01 ` Eric W. Biederman
2017-07-25 1:37 ` Al Viro
2017-07-31 16:37 ` Eric W. Biederman
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=20170718140651.15973-5-ebiederm@xmission.com \
--to=ebiederm@xmission.com \
--cc=avagin@openvz.org \
--cc=avagin@virtuozzo.com \
--cc=containers@lists.linux-foundation.org \
--cc=dave.hansen@linux.intel.com \
--cc=gorcunov@openvz.org \
--cc=greg@kroah.com \
--cc=linux-api@vger.kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mtk.manpages@gmail.com \
--cc=oleg@redhat.com \
--cc=peterz@infradead.org \
--cc=serge@hallyn.com \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
--cc=viro@zeniv.linux.org.uk \
--cc=w@1wt.eu \
--cc=xemul@virtuozzo.com \
/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).