From: Damien Miller <djm@mindrot.org>
Date: Fri, 23 Aug 2019 00:19:30 +0000 (+1000)
Subject: use SC_ALLOW_ARG_MASK to limit mmap protections
X-Git-Tag: V_8_1_P1~98
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e83c989bfd9fc9838b7dfb711d1dc6da81814045;p=thirdparty%2Fopenssh-portable.git

use SC_ALLOW_ARG_MASK to limit mmap protections

Restrict to PROT_(READ|WRITE|NONE), i.e. exclude PROT_EXEC
---

diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
index 7b44755cb..840c5232b 100644
--- a/sandbox-seccomp-filter.c
+++ b/sandbox-seccomp-filter.c
@@ -216,10 +216,10 @@ static const struct sock_filter preauth_insns[] = {
 	SC_ALLOW(__NR_madvise),
 #endif
 #ifdef __NR_mmap
-	SC_ALLOW(__NR_mmap),
+	SC_ALLOW_ARG_MASK(__NR_mmap, 2, PROT_READ|PROT_WRITE|PROT_NONE),
 #endif
 #ifdef __NR_mmap2
-	SC_ALLOW(__NR_mmap2),
+	SC_ALLOW_ARG_MASK(__NR_mmap2, 2, PROT_READ|PROT_WRITE|PROT_NONE),
 #endif
 #ifdef __NR_mprotect
 	SC_ALLOW_ARG_MASK(__NR_mprotect, 2, PROT_READ|PROT_WRITE|PROT_NONE),