From: Cyril Bur <cyrilbur@gmail.com>
To: linuxppc-dev@ozlabs.org
Cc: mikey@neuling.org
Subject: [PATCH V2 1/5] selftests/powerpc: Add exec() test to check for spr sanitisation
Date: Tue, 5 Apr 2016 09:59:23 +1000 [thread overview]
Message-ID: <1459814367-3057-1-git-send-email-cyrilbur@gmail.com> (raw)
Signed-off-by: Cyril Bur <cyrilbur@gmail.com>
---
tools/testing/selftests/powerpc/syscalls/Makefile | 3 +-
.../testing/selftests/powerpc/syscalls/spr_exec.c | 78 ++++++++++++++++++++++
2 files changed, 80 insertions(+), 1 deletion(-)
create mode 100644 tools/testing/selftests/powerpc/syscalls/spr_exec.c
diff --git a/tools/testing/selftests/powerpc/syscalls/Makefile b/tools/testing/selftests/powerpc/syscalls/Makefile
index b35c794..291ba45 100644
--- a/tools/testing/selftests/powerpc/syscalls/Makefile
+++ b/tools/testing/selftests/powerpc/syscalls/Makefile
@@ -1,10 +1,11 @@
-TEST_PROGS := ipc_unmuxed
+TEST_PROGS := ipc_unmuxed spr_exec
CFLAGS += -I../../../../../usr/include
all: $(TEST_PROGS)
$(TEST_PROGS): ../harness.c
+spr_exec: ../utils.c
include ../../lib.mk
diff --git a/tools/testing/selftests/powerpc/syscalls/spr_exec.c b/tools/testing/selftests/powerpc/syscalls/spr_exec.c
new file mode 100644
index 0000000..5ecd6ca
--- /dev/null
+++ b/tools/testing/selftests/powerpc/syscalls/spr_exec.c
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2016, Cyril Bur, IBM Corp.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ *
+ * This test checks that the TAR (an SPR) is correctly sanitised across
+ * execve()
+ */
+#include <asm/cputable.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/auxv.h>
+#include <unistd.h>
+
+#include "utils.h"
+
+static char *name;
+static int count;
+
+static int exec_spr(void)
+{
+ unsigned long tar;
+ char buffer[10];
+ char *args[3];
+
+ asm __volatile__(
+ "mfspr %[tar], 815"
+ : [tar] "=r" (tar)
+ );
+ /* Read TAR */
+ FAIL_IF(tar != 0);
+
+ tar = 1;
+ asm __volatile__(
+ "mtspr 815, %[tar]"
+ :
+ : [tar] "r" (tar)
+ );
+
+ FAIL_IF(sprintf(buffer, "%d", count + 1) == -1);
+ args[0] = name;
+ args[1] = buffer;
+ args[2] = NULL;
+ FAIL_IF(execve(name, args, NULL) == -1);
+
+ return 0;
+}
+
+static int exec_spr_check(void)
+{
+ unsigned long tar;
+
+ asm __volatile__(
+ "mfspr %[tar], 815;"
+ : [tar] "=r" (tar)
+ );
+ /* Read TAR */
+ FAIL_IF(tar != 0);
+
+ return 0;
+}
+
+int main(int argc, char *argv[])
+{
+ SKIP_IF(!have_hwcap2(PPC_FEATURE2_TAR));
+ name = argv[0];
+ /* Do this a few times to be sure isn't a false negative */
+ if (argc == 1 || atoi(argv[1]) < 10) {
+ if (argc > 1)
+ count = atoi(argv[1]);
+ return test_harness(exec_spr, "spr_exec");
+ } else {
+ return test_harness(exec_spr_check, "spr_exec_check");
+ }
+}
--
2.7.4
next reply other threads:[~2016-04-05 0:01 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-04 23:59 Cyril Bur [this message]
2016-04-04 23:59 ` [PATCH V2 2/5] selftests/powerpc: Add fork() test to check for spr being preserved Cyril Bur
2016-04-04 23:59 ` [PATCH V2 3/5] powerpc: Fix SPR leak across exec() syscalls Cyril Bur
2016-04-04 23:59 ` [PATCH V2 4/5] powerpc: Move flush_all_to_thread() below save_sprs() Cyril Bur
2016-04-04 23:59 ` [PATCH V2 5/5] powerpc: Preserve the SPR values across fork() syscalls Cyril Bur
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=1459814367-3057-1-git-send-email-cyrilbur@gmail.com \
--to=cyrilbur@gmail.com \
--cc=linuxppc-dev@ozlabs.org \
--cc=mikey@neuling.org \
/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).