summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-03-17 14:45:56 +1100
committerDamien Miller <djm@mindrot.org>2014-03-17 14:45:56 +1100
commit48abc47e60048461fe9117e108a7e99ea1ac2bb8 (patch)
tree83ea12268ed3c5999697b7d9e75bfed93e71c0d8
parent9c36698ca2f554ec221dc7ef29c7a89e97c88705 (diff)
- (djm) [sandbox-seccomp-filter.c] Soft-fail stat() syscalls. Add XXX to
remind myself to add sandbox violation logging via the log socket.
-rw-r--r--ChangeLog4
-rw-r--r--sandbox-seccomp-filter.c3
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 500087088..4e6b8b2d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120140317
2 - (djm) [sandbox-seccomp-filter.c] Soft-fail stat() syscalls. Add XXX to
3 remind myself to add sandbox violation logging via the log socket.
4
120140314 520140314
2 - (tim) [opensshd.init.in] Add support for ed25519 6 - (tim) [opensshd.init.in] Add support for ed25519
3 7
diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
index c0c17c2fc..c2be00696 100644
--- a/sandbox-seccomp-filter.c
+++ b/sandbox-seccomp-filter.c
@@ -25,6 +25,8 @@
25 */ 25 */
26/* #define SANDBOX_SECCOMP_FILTER_DEBUG 1 */ 26/* #define SANDBOX_SECCOMP_FILTER_DEBUG 1 */
27 27
28/* XXX it should be possible to do logging via the log socket safely */
29
28#ifdef SANDBOX_SECCOMP_FILTER_DEBUG 30#ifdef SANDBOX_SECCOMP_FILTER_DEBUG
29/* Use the kernel headers in case of an older toolchain. */ 31/* Use the kernel headers in case of an older toolchain. */
30# include <asm/siginfo.h> 32# include <asm/siginfo.h>
@@ -89,6 +91,7 @@ static const struct sock_filter preauth_insns[] = {
89 BPF_STMT(BPF_LD+BPF_W+BPF_ABS, 91 BPF_STMT(BPF_LD+BPF_W+BPF_ABS,
90 offsetof(struct seccomp_data, nr)), 92 offsetof(struct seccomp_data, nr)),
91 SC_DENY(open, EACCES), 93 SC_DENY(open, EACCES),
94 SC_DENY(stat, EACCES),
92 SC_ALLOW(getpid), 95 SC_ALLOW(getpid),
93 SC_ALLOW(gettimeofday), 96 SC_ALLOW(gettimeofday),
94 SC_ALLOW(clock_gettime), 97 SC_ALLOW(clock_gettime),