From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 13 Jul 2016 13:16:59 +0000 (-0400)
Subject: Merge remote-tracking branch 'Jigsaw52/seccomp-fix-18397' into maint-0.2.8
X-Git-Tag: tor-0.2.8.6~13^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb731ca665672c97aec7451921688381a2c8e9cb;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'Jigsaw52/seccomp-fix-18397' into maint-0.2.8
---

bb731ca665672c97aec7451921688381a2c8e9cb
diff --cc src/common/sandbox.c
index 70c5bbd07c,b194c240d7..c0b994b3e8
--- a/src/common/sandbox.c
+++ b/src/common/sandbox.c
@@@ -207,11 -207,10 +207,15 @@@ static int filter_nopar_gen[] = 
      // getaddrinfo uses this..
      SCMP_SYS(stat64),
  #endif
 +
 +#ifdef __NR_getrandom
 +    SCMP_SYS(getrandom),
 +#endif
 +
+ #ifdef __NR_sysinfo
+     // qsort uses this..
+     SCMP_SYS(sysinfo),
+ #endif
      /*
       * These socket syscalls are not required on x86_64 and not supported with
       * some libseccomp versions (eg: 1.0.1)