summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-09-10 08:15:34 +1000
committerDamien Miller <djm@mindrot.org>2014-09-10 08:15:34 +1000
commit0fa0ed061bbfedb0daa705e220748154a84c3413 (patch)
treedff0a0196cadea85b7e350f3edc56350b69b755a
parentad7d23d461c3b7e1dcb15db13aee5f4b94dc1a95 (diff)
downloadopenssh-git-0fa0ed061bbfedb0daa705e220748154a84c3413.tar.gz
- (djm) [sandbox-seccomp-filter.c] Allow mremap and exit for DietLibc;
patch from Felix von Leitner; ok dtucker
-rw-r--r--ChangeLog4
-rw-r--r--sandbox-seccomp-filter.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 2c9dc50f..5a5136b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20140910
+ - (djm) [sandbox-seccomp-filter.c] Allow mremap and exit for DietLibc;
+ patch from Felix von Leitner; ok dtucker
+
20140908
- (dtucker) [INSTALL] Update info about egd. ok djm@
diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
index c2be0069..b6f6258f 100644
--- a/sandbox-seccomp-filter.c
+++ b/sandbox-seccomp-filter.c
@@ -118,6 +118,10 @@ static const struct sock_filter preauth_insns[] = {
#ifdef __NR_mmap
SC_ALLOW(mmap),
#endif
+#ifdef __dietlibc__
+ SC_ALLOW(mremap),
+ SC_ALLOW(exit),
+#endif
SC_ALLOW(munmap),
SC_ALLOW(exit_group),
#ifdef __NR_rt_sigprocmask