summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--sandbox-seccomp-filter.c1
-rw-r--r--sandbox-systrace.c1
3 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c0dab651b..f9740631e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120140131
2 - (djm) [sandbox-seccomp-filter.c sandbox-systrace.c] Allow shutdown(2)
3 syscall from sandboxes; it may be called by packet_close.
4
120140130 520140130
2 - (djm) [configure.ac] Only check for width-specified integer types 6 - (djm) [configure.ac] Only check for width-specified integer types
3 in headers that actually exist. patch from Tom G. Christensen; 7 in headers that actually exist. patch from Tom G. Christensen;
diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
index 2f73067e1..dbda60bab 100644
--- a/sandbox-seccomp-filter.c
+++ b/sandbox-seccomp-filter.c
@@ -98,6 +98,7 @@ static const struct sock_filter preauth_insns[] = {
98 SC_ALLOW(read), 98 SC_ALLOW(read),
99 SC_ALLOW(write), 99 SC_ALLOW(write),
100 SC_ALLOW(close), 100 SC_ALLOW(close),
101 SC_ALLOW(shutdown),
101 SC_ALLOW(brk), 102 SC_ALLOW(brk),
102 SC_ALLOW(poll), 103 SC_ALLOW(poll),
103#ifdef __NR__newselect 104#ifdef __NR__newselect
diff --git a/sandbox-systrace.c b/sandbox-systrace.c
index 53fbd47cb..3d4677838 100644
--- a/sandbox-systrace.c
+++ b/sandbox-systrace.c
@@ -66,6 +66,7 @@ static const struct sandbox_policy preauth_policy[] = {
66 { SYS_munmap, SYSTR_POLICY_PERMIT }, 66 { SYS_munmap, SYSTR_POLICY_PERMIT },
67 { SYS_read, SYSTR_POLICY_PERMIT }, 67 { SYS_read, SYSTR_POLICY_PERMIT },
68 { SYS_select, SYSTR_POLICY_PERMIT }, 68 { SYS_select, SYSTR_POLICY_PERMIT },
69 { SYS_shutdown, SYSTR_POLICY_PERMIT },
69 { SYS_sigprocmask, SYSTR_POLICY_PERMIT }, 70 { SYS_sigprocmask, SYSTR_POLICY_PERMIT },
70 { SYS_write, SYSTR_POLICY_PERMIT }, 71 { SYS_write, SYSTR_POLICY_PERMIT },
71 { -1, -1 } 72 { -1, -1 }