From: tip-bot for Ingo Molnar <mingo@elte.hu>
To: linux-tip-commits@vger.kernel.org
Cc: mingo@redhat.com, brgerst@gmail.com,
torvalds@linux-foundation.org, mikpe@it.uu.se,
richard.weinberger@gmail.com, jj@chaosbits.net,
JBeulich@novell.com, tglx@linutronix.de,
Louis.Rilling@kerlabs.com, hpa@zytor.com,
linux-kernel@vger.kernel.org, luto@mit.edu, andi@firstfloor.org,
bp@alien8.de, arjan@infradead.org, mingo@elte.hu
Subject: [tip:x86/vdso] x86-64, vdso, seccomp: Fix !CONFIG_SECCOMP build
Date: Mon, 6 Jun 2011 08:35:18 GMT [thread overview]
Message-ID: <tip-764611c8dfb5be43611296affd92272b7215daea@git.kernel.org> (raw)
In-Reply-To: <e64e1b3c64858820d12c48fa739efbd1485e79d5.1307292171.git.luto@mit.edu>
Commit-ID: 764611c8dfb5be43611296affd92272b7215daea
Gitweb: http://git.kernel.org/tip/764611c8dfb5be43611296affd92272b7215daea
Author: Ingo Molnar <mingo@elte.hu>
AuthorDate: Mon, 6 Jun 2011 10:00:01 +0200
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Mon, 6 Jun 2011 10:00:01 +0200
x86-64, vdso, seccomp: Fix !CONFIG_SECCOMP build
Factor out seccomp->mode access into an inline function and make
it work in the !CONFIG_SECCOMP case as well.
Cc: Andy Lutomirski <luto@mit.edu>
Cc: Jesper Juhl <jj@chaosbits.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Arjan van de Ven <arjan@infradead.org>
Cc: Jan Beulich <JBeulich@novell.com>
Cc: richard -rw- weinberger <richard.weinberger@gmail.com>
Cc: Mikael Pettersson <mikpe@it.uu.se>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Louis Rilling <Louis.Rilling@kerlabs.com>
Cc: Valdis.Kletnieks@vt.edu
Cc: pageexec@freemail.hu
Link: http://lkml.kernel.org/r/e64e1b3c64858820d12c48fa739efbd1485e79d5.1307292171.git.luto@mit.edu
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/x86/kernel/vsyscall_64.c | 2 +-
include/linux/seccomp.h | 10 ++++++++++
2 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
index 52ba392..285af7a 100644
--- a/arch/x86/kernel/vsyscall_64.c
+++ b/arch/x86/kernel/vsyscall_64.c
@@ -188,7 +188,7 @@ void dotraplinkage do_emulate_vsyscall(struct pt_regs *regs, long error_code)
}
tsk = current;
- if (tsk->seccomp.mode) {
+ if (seccomp_mode(&tsk->seccomp)) {
do_exit(SIGKILL);
goto out;
}
diff --git a/include/linux/seccomp.h b/include/linux/seccomp.h
index 167c333..cc7a4e9 100644
--- a/include/linux/seccomp.h
+++ b/include/linux/seccomp.h
@@ -19,6 +19,11 @@ static inline void secure_computing(int this_syscall)
extern long prctl_get_seccomp(void);
extern long prctl_set_seccomp(unsigned long);
+static inline int seccomp_mode(seccomp_t *s)
+{
+ return s->mode;
+}
+
#else /* CONFIG_SECCOMP */
#include <linux/errno.h>
@@ -37,6 +42,11 @@ static inline long prctl_set_seccomp(unsigned long arg2)
return -EINVAL;
}
+static inline int seccomp_mode(seccomp_t *s)
+{
+ return 0;
+}
+
#endif /* CONFIG_SECCOMP */
#endif /* _LINUX_SECCOMP_H */
next prev parent reply other threads:[~2011-06-06 8:35 UTC|newest]
Thread overview: 112+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-05 17:50 [PATCH v5 0/9] Remove syscall instructions at fixed addresses Andy Lutomirski
2011-06-05 17:50 ` [PATCH v5 1/9] x86-64: Fix alignment of jiffies variable Andy Lutomirski
2011-06-06 8:31 ` [tip:x86/vdso] " tip-bot for Andy Lutomirski
2011-06-05 17:50 ` [PATCH v5 2/9] x86-64: Document some of entry_64.S Andy Lutomirski
2011-06-06 8:31 ` [tip:x86/vdso] " tip-bot for Andy Lutomirski
2011-06-05 17:50 ` [PATCH v5 3/9] x86-64: Give vvars their own page Andy Lutomirski
2011-06-06 8:32 ` [tip:x86/vdso] " tip-bot for Andy Lutomirski
2011-06-05 17:50 ` [PATCH v5 4/9] x86-64: Remove kernel.vsyscall64 sysctl Andy Lutomirski
2011-06-06 8:32 ` [tip:x86/vdso] " tip-bot for Andy Lutomirski
2011-12-05 18:27 ` [PATCH v5 4/9] " Matthew Maurer
2011-06-05 17:50 ` [PATCH v5 5/9] x86-64: Map the HPET NX Andy Lutomirski
2011-06-06 8:33 ` [tip:x86/vdso] " tip-bot for Andy Lutomirski
2011-06-05 17:50 ` [PATCH v5 6/9] x86-64: Remove vsyscall number 3 (venosys) Andy Lutomirski
2011-06-06 8:33 ` [tip:x86/vdso] " tip-bot for Andy Lutomirski
2011-06-05 17:50 ` [PATCH v5 7/9] x86-64: Fill unused parts of the vsyscall page with 0xcc Andy Lutomirski
2011-06-06 8:34 ` [tip:x86/vdso] " tip-bot for Andy Lutomirski
2011-06-05 17:50 ` [PATCH v5 8/9] x86-64: Emulate legacy vsyscalls Andy Lutomirski
2011-06-05 19:30 ` Ingo Molnar
2011-06-05 20:01 ` Andrew Lutomirski
2011-06-06 7:39 ` Ingo Molnar
2011-06-06 9:42 ` pageexec
2011-06-06 11:19 ` Andrew Lutomirski
2011-06-06 11:56 ` pageexec
2011-06-06 12:43 ` Andrew Lutomirski
2011-06-06 13:58 ` pageexec
2011-06-06 14:07 ` Brian Gerst
2011-06-07 23:32 ` pageexec
2011-06-07 23:49 ` Andrew Lutomirski
2011-06-08 6:32 ` pageexec
2011-06-06 15:26 ` Ingo Molnar
2011-06-06 15:48 ` pageexec
2011-06-06 15:59 ` Ingo Molnar
2011-06-06 16:19 ` pageexec
2011-06-06 16:47 ` Ingo Molnar
2011-06-06 22:49 ` pageexec
2011-06-06 22:57 ` david
2011-06-07 9:07 ` Ingo Molnar
2011-06-07 6:59 ` Pekka Enberg
2011-06-07 8:30 ` Ingo Molnar
2011-06-07 23:24 ` pageexec
2011-06-08 5:55 ` Pekka Enberg
2011-06-08 6:19 ` pageexec
2011-06-08 6:48 ` Ingo Molnar
2011-06-08 9:02 ` pageexec
2011-06-08 9:11 ` Andi Kleen
2011-06-08 9:35 ` pageexec
2011-06-08 10:06 ` Andi Kleen
2011-06-08 10:26 ` pageexec
2011-06-08 10:39 ` Ingo Molnar
2011-06-08 10:35 ` Ingo Molnar
2011-06-08 9:15 ` Ingo Molnar
2011-06-08 7:16 ` Ingo Molnar
2011-06-08 9:29 ` pageexec
2011-06-06 14:01 ` Linus Torvalds
2011-06-06 14:55 ` pageexec
2011-06-06 15:33 ` Ingo Molnar
2011-06-06 15:58 ` pageexec
2011-06-06 15:41 ` Ingo Molnar
2011-06-06 8:34 ` [tip:x86/vdso] " tip-bot for Andy Lutomirski
2011-06-06 8:35 ` tip-bot for Ingo Molnar [this message]
2011-06-07 7:49 ` tip-bot for Andy Lutomirski
2011-06-07 8:03 ` tip-bot for Andy Lutomirski
2011-06-05 17:50 ` [PATCH v5 9/9] x86-64: Add CONFIG_UNSAFE_VSYSCALLS to feature-removal-schedule Andy Lutomirski
2011-06-06 8:34 ` [tip:x86/vdso] " tip-bot for Andy Lutomirski
2011-06-06 8:46 ` [PATCH v5 9/9] " Linus Torvalds
2011-06-06 9:31 ` Andi Kleen
2011-06-06 10:39 ` pageexec
2011-06-06 13:56 ` Linus Torvalds
2011-06-06 18:46 ` pageexec
2011-06-06 20:40 ` Linus Torvalds
2011-06-06 20:51 ` Andrew Lutomirski
2011-06-06 21:54 ` Ingo Molnar
2011-06-06 21:45 ` Ingo Molnar
2011-06-06 21:48 ` Ingo Molnar
[not found] ` <BANLkTi==uw_h78oaep1cCOCzwY0edLUU_Q@mail.gmail.com>
2011-06-07 8:03 ` [PATCH, v6] x86-64: Emulate legacy vsyscalls Ingo Molnar
2011-06-06 21:53 ` [PATCH v5 9/9] x86-64: Add CONFIG_UNSAFE_VSYSCALLS to feature-removal-schedule pageexec
2011-06-06 14:44 ` Ingo Molnar
2011-06-06 15:01 ` pageexec
2011-06-06 15:15 ` Ingo Molnar
2011-06-06 15:29 ` pageexec
2011-06-06 16:54 ` Ingo Molnar
2011-06-06 18:59 ` pageexec
2011-06-06 19:25 ` Ingo Molnar
2011-06-07 0:34 ` pageexec
2011-06-07 9:51 ` Ingo Molnar
2011-06-07 23:24 ` pageexec
2011-06-10 11:19 ` Ingo Molnar
2011-06-14 0:48 ` pageexec
2011-06-15 19:42 ` Valdis.Kletnieks
2011-06-06 14:52 ` Ingo Molnar
2011-06-06 10:24 ` [PATCH] x86-64, vsyscalls: Rename UNSAFE_VSYSCALLS to COMPAT_VSYSCALLS Ingo Molnar
2011-06-06 11:20 ` pageexec
2011-06-06 12:47 ` Ingo Molnar
2011-06-06 12:48 ` Ingo Molnar
2011-06-06 18:04 ` pageexec
2011-06-06 19:12 ` Ingo Molnar
2011-06-07 0:02 ` pageexec
2011-06-07 9:56 ` Ingo Molnar
2011-06-07 23:24 ` pageexec
2011-06-09 6:48 ` Ingo Molnar
2011-06-09 23:33 ` pageexec
2011-06-07 10:05 ` Ingo Molnar
2011-06-07 23:24 ` pageexec
2011-06-09 7:02 ` Ingo Molnar
2011-06-09 23:33 ` pageexec
2011-06-07 10:13 ` Ingo Molnar
2011-06-07 23:24 ` pageexec
2011-06-06 12:19 ` Ted Ts'o
2011-06-06 12:33 ` Andrew Lutomirski
2011-06-06 12:37 ` Ingo Molnar
2011-06-06 14:34 ` [tip:x86/vdso] " tip-bot for Ingo Molnar
2011-06-05 20:05 ` [PATCH v5 0/9] Remove syscall instructions at fixed addresses Andrew Lutomirski
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=tip-764611c8dfb5be43611296affd92272b7215daea@git.kernel.org \
--to=mingo@elte.hu \
--cc=JBeulich@novell.com \
--cc=Louis.Rilling@kerlabs.com \
--cc=andi@firstfloor.org \
--cc=arjan@infradead.org \
--cc=bp@alien8.de \
--cc=brgerst@gmail.com \
--cc=hpa@zytor.com \
--cc=jj@chaosbits.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=luto@mit.edu \
--cc=mikpe@it.uu.se \
--cc=mingo@redhat.com \
--cc=richard.weinberger@gmail.com \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.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).