[tor-commits] [tor/master] Merge remote-tracking branch 'Jigsaw52/seccomp-fix-18397' into maint-0.2.8

[nickm at torproject.org]

commit bb731ca665672c97aec7451921688381a2c8e9cb
Merge: a931d15 20e89453
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 13 09:16:59 2016 -0400

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

 src/common/sandbox.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --cc src/common/sandbox.c
index 70c5bbd,b194c24..c0b994b
--- 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)