upstream commit

getentropy() and sendsyslog() have been around long
 enough. openssh-portable may want the #ifdef's but not base. discussed with
 djm few weeks back

Upstream-ID: 0506a4334de108e3fb6c66f8d6e0f9c112866926

1 files changed, 9 insertions, 11 deletions

diff --git a/sandbox-systrace.c b/sandbox-systrace.c
index f30e70575..f8a552898 100644
--- a/sandbox-systrace.c
+++ b/sandbox-systrace.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sandbox-systrace.c,v 1.14 2015/01/20 23:14:00 deraadt Exp $ */
+/* $OpenBSD: sandbox-systrace.c,v 1.15 2015/05/18 15:06:05 deraadt Exp $ */
 /*
  * Copyright (c) 2011 Damien Miller <djm@mindrot.org>
  *
@@ -50,8 +50,9 @@ struct sandbox_policy {
 
 /* Permitted syscalls in preauth. Unlisted syscalls get SYSTR_POLICY_KILL */
 static const struct sandbox_policy preauth_policy[] = {
-        { SYS_open, SYSTR_POLICY_NEVER },
-
+        { SYS_clock_gettime, SYSTR_POLICY_PERMIT },
+        { SYS_close, SYSTR_POLICY_PERMIT },
+        { SYS_exit, SYSTR_POLICY_PERMIT },
 #ifdef SYS_getentropy
         /* OpenBSD 5.6 and newer use getentropy(2) to seed arc4random(3). */
         { SYS_getentropy, SYSTR_POLICY_PERMIT },
@@ -59,23 +60,20 @@ static const struct sandbox_policy preauth_policy[] = {
         /* Previous releases used sysctl(3)'s kern.arnd variable. */
         { SYS___sysctl, SYSTR_POLICY_PERMIT },
 #endif
-
-#ifdef SYS_sendsyslog
-        { SYS_sendsyslog, SYSTR_POLICY_PERMIT },
-#endif
-        { SYS_close, SYSTR_POLICY_PERMIT },
-        { SYS_exit, SYSTR_POLICY_PERMIT },
         { SYS_getpid, SYSTR_POLICY_PERMIT },
         { SYS_gettimeofday, SYSTR_POLICY_PERMIT },
-        { SYS_clock_gettime, SYSTR_POLICY_PERMIT },
         { SYS_madvise, SYSTR_POLICY_PERMIT },
         { SYS_mmap, SYSTR_POLICY_PERMIT },
         { SYS_mprotect, SYSTR_POLICY_PERMIT },
         { SYS_mquery, SYSTR_POLICY_PERMIT },
-        { SYS_poll, SYSTR_POLICY_PERMIT },
         { SYS_munmap, SYSTR_POLICY_PERMIT },
+        { SYS_open, SYSTR_POLICY_NEVER },
+        { SYS_poll, SYSTR_POLICY_PERMIT },
         { SYS_read, SYSTR_POLICY_PERMIT },
         { SYS_select, SYSTR_POLICY_PERMIT },
+#ifdef SYS_sendsyslog
+        { SYS_sendsyslog, SYSTR_POLICY_PERMIT },
+#endif
         { SYS_shutdown, SYSTR_POLICY_PERMIT },
         { SYS_sigprocmask, SYSTR_POLICY_PERMIT },
         { SYS_write, SYSTR_POLICY_PERMIT },