Deny (non-fatal) ipc in preauth privsep child

Closes: #946242

5 files changed, 42 insertions, 2 deletions

diff --git a/debian/.git-dpm b/debian/.git-dpm
index c1b3b255f..824b73ce4 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-93e9440bae1818746e0cc7f2543001db9d0ea1ea
-93e9440bae1818746e0cc7f2543001db9d0ea1ea
+489e04f2c23327dd95981327d8757144a4e574af
+489e04f2c23327dd95981327d8757144a4e574af
 4213eec74e74de6310c27a40c3e9759a08a73996
 4213eec74e74de6310c27a40c3e9759a08a73996
 openssh_8.1p1.orig.tar.gz
diff --git a/debian/changelog b/debian/changelog
index 60660a0d3..9dd91de32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ openssh (1:8.1p1-5) UNRELEASED; urgency=medium
 
   * Apply upstream patches to allow clock_nanosleep() and variants in the
     seccomp sandbox, fixing failures with glibc 2.31.
+  * Apply upstream patch to deny (non-fatally) ipc in the seccomp sandbox,
+    fixing failures with OpenSSL 1.1.1d and Linux < 3.19 on some
+    architectures (closes: #946242).
 
  -- Colin Watson <cjwatson@debian.org>  Sat, 11 Jan 2020 23:27:35 +0000
 
diff --git a/debian/patches/sandbox-seccomp-ipc.patch b/debian/patches/sandbox-seccomp-ipc.patch
new file mode 100644
index 000000000..cbeb6613d
--- /dev/null
+++ b/debian/patches/sandbox-seccomp-ipc.patch
@@ -0,0 +1,33 @@
+From 489e04f2c23327dd95981327d8757144a4e574af Mon Sep 17 00:00:00 2001
+From: Jeremy Drake <github@jdrake.com>
+Date: Fri, 11 Oct 2019 18:31:05 -0700
+Subject: Deny (non-fatal) ipc in preauth privsep child.
+
+As noted in openssh/openssh-portable#149, i386 does not have have
+_NR_shmget etc.  Instead, it has a single ipc syscall (see man 2 ipc,
+https://linux.die.net/man/2/ipc).  Add this syscall, if present, to the
+list of syscalls that seccomp will deny non-fatally.
+
+Bug-Debian: https://bugs.debian.org/946242
+Origin: upstream, https://anongit.mindrot.org/openssh.git/commit/?id=30f704ebc0e9e32b3d12f5d9e8c1b705fdde2c89
+Last-Update: 2020-01-11
+
+Patch-Name: sandbox-seccomp-ipc.patch
+---
+ sandbox-seccomp-filter.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
+index 999c46c9f..0914e48ba 100644
+--- a/sandbox-seccomp-filter.c
++++ b/sandbox-seccomp-filter.c
+@@ -177,6 +177,9 @@ static const struct sock_filter preauth_insns[] = {
+ #ifdef __NR_shmdt
+        SC_DENY(__NR_shmdt, EACCES),
+ #endif
++#ifdef __NR_ipc
++       SC_DENY(__NR_ipc, EACCES),
++#endif
+ 
+        /* Syscalls to permit */
+ #ifdef __NR_brk
diff --git a/debian/patches/series b/debian/patches/series
index 8dbd1355a..59c651095 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -27,3 +27,4 @@ regress-2020.patch
 sandbox-seccomp-clock_nanosleep.patch
 sandbox-seccomp-clock_nanosleep_time64.patch
 sandbox-seccomp-clock_gettime64.patch
+sandbox-seccomp-ipc.patch
diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
index 999c46c9f..0914e48ba 100644
--- a/sandbox-seccomp-filter.c
+++ b/sandbox-seccomp-filter.c
@@ -177,6 +177,9 @@ static const struct sock_filter preauth_insns[] = {
 #ifdef __NR_shmdt
         SC_DENY(__NR_shmdt, EACCES),
 #endif
+#ifdef __NR_ipc
+        SC_DENY(__NR_ipc, EACCES),
+#endif
 
         /* Syscalls to permit */
 #ifdef __NR_brk