summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2012-06-30 08:33:53 +1000
committerDamien Miller <djm@mindrot.org>2012-06-30 08:33:53 +1000
commit560de922b18fe7fcea8cc837d87cd4609738eb0f (patch)
treeb468c4544f157970177d0c69319121a4b58121e2
parentea8582931f40fcf49ed8ce94711a329c0b49dc7d (diff)
- dtucker@cvs.openbsd.org 2012/06/26 11:02:30
[sandbox-systrace.c] Add mquery to the list of allowed syscalls for "UsePrivilegeSeparation sandbox" since malloc now uses it. From johnw.mail at gmail com.
-rw-r--r--ChangeLog4
-rw-r--r--sandbox-systrace.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5c00e1863..f4627f041 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,10 @@
11 [sftp.c] 11 [sftp.c]
12 Remove unused variable leftover from tab-completion changes. 12 Remove unused variable leftover from tab-completion changes.
13 From Steve.McClellan at radisys com, ok markus@ 13 From Steve.McClellan at radisys com, ok markus@
14 - dtucker@cvs.openbsd.org 2012/06/26 11:02:30
15 [sandbox-systrace.c]
16 Add mquery to the list of allowed syscalls for "UsePrivilegeSeparation
17 sandbox" since malloc now uses it. From johnw.mail at gmail com.
14 18
1520120628 1920120628
16 - (dtucker) [openbsd-compat/getrrsetbyname-ldns.c] bz #2022: prevent null 20 - (dtucker) [openbsd-compat/getrrsetbyname-ldns.c] bz #2022: prevent null
diff --git a/sandbox-systrace.c b/sandbox-systrace.c
index 5a39f4fe1..199b69f44 100644
--- a/sandbox-systrace.c
+++ b/sandbox-systrace.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sandbox-systrace.c,v 1.4 2011/07/29 14:42:45 djm Exp $ */ 1/* $OpenBSD: sandbox-systrace.c,v 1.5 2012/06/26 11:02:30 dtucker Exp $ */
2/* 2/*
3 * Copyright (c) 2011 Damien Miller <djm@mindrot.org> 3 * Copyright (c) 2011 Damien Miller <djm@mindrot.org>
4 * 4 *
@@ -58,6 +58,7 @@ static const struct sandbox_policy preauth_policy[] = {
58 { SYS_madvise, SYSTR_POLICY_PERMIT }, 58 { SYS_madvise, SYSTR_POLICY_PERMIT },
59 { SYS_mmap, SYSTR_POLICY_PERMIT }, 59 { SYS_mmap, SYSTR_POLICY_PERMIT },
60 { SYS_mprotect, SYSTR_POLICY_PERMIT }, 60 { SYS_mprotect, SYSTR_POLICY_PERMIT },
61 { SYS_mquery, SYSTR_POLICY_PERMIT },
61 { SYS_poll, SYSTR_POLICY_PERMIT }, 62 { SYS_poll, SYSTR_POLICY_PERMIT },
62 { SYS_munmap, SYSTR_POLICY_PERMIT }, 63 { SYS_munmap, SYSTR_POLICY_PERMIT },
63 { SYS_read, SYSTR_POLICY_PERMIT }, 64 { SYS_read, SYSTR_POLICY_PERMIT },