Backed out 2 changesets (bug 1409900) for failing browser chrome on Linux opt at browser/base/content/test/general/browser_bug590206.js r=backout a=backout.
authorAttila Craciun <acraciun@mozilla.com>
Fri, 27 Oct 2017 16:15:47 +0300
changeset 687660 ae49d4a5762264ded3aae4006baddc2203b79b94
parent 687532 ecef003d836730c07ecfcfa25df8e71a88aec99f
child 687661 eb961900025ffc20147daab0ebda7a515aca94a2
child 687685 5eafcdcf8289dc4a9bc00dcb26902c97a84e64e6
child 687690 9a2d19f1ce10c2f753f5d5d762ed1d523a5dfc74
child 687699 f436ce17387cfbdc434e65f6e6462a9570c1f1b4
child 687730 e4e2419d88d5b5e9d9d63fac7035de06952500f6
child 687736 150d1c1bf6f949a3c15485513432068b40a00043
child 687741 775f6e60f0ee0331199d6b5ec9c9a75b47c96f1f
child 687767 5716ac9948967ce1b9b9829bcdebd68d5997c1d8
child 687770 ab59b699887822640c3ebc61ecaca79ca7b658b8
child 687780 57952649fa57fd8cd580eac991a42727f3216694
child 687794 ba395b9d2f8dfa19c5cddfb79983bb5915e23bc2
child 687811 b69abf78c004e8e0c6829e1817c42cbc01091f1c
child 687819 09349dc43386bdfc80ab3802769c57fcbcf065d2
child 687841 1f716e3d0a6d7b2f06fd3b7a9db53e8a456e1d10
child 687845 0484353450b461daed90e946e9afc682d98cde94
child 687899 d8e1ed6dd42c040e8f9e7a6c3d3248a8b15e3865
child 687950 76b80aae66ccd6fe16367c0a8a79f180cf5f3912
child 687972 fc1ac52cef29b8db0052cb90a3558637c89cff3e
child 688019 2ee7c6d03803207b57670b0b50197f24426a066e
child 688031 96a44558268371e335944e7fb2dfeaad30e4bcbf
child 688056 d39ed96d20a1eca1a55847a48c79a413b589ba4c
child 688059 f19339207df8aefb66b334de7eb4686fad820504
child 688083 880a48cb96ed13a9c95b1f4b374d76a37efbe4ff
child 688389 2a38d6e34afeb6aa5792fd14865deb72eea6a4d2
child 688790 3abb1c22d8b95cd363fae03764f6b180ebf330d5
child 689576 eaff3b648b35eabbbbf66124b171a83b1f81ee16
child 689626 4fbe28af35dfeb90579e81f454e0e513fe68ad28
child 689637 4257175f3b811343927363581e5303666e33a505
child 689638 41e10dd11416ad3cb8d0a92d7b984911d970d38e
child 691898 f9973cee809b2920f568ef850f19a87f61a8cca1
push id86562
push userbmo:tchiovoloni@mozilla.com
push dateFri, 27 Oct 2017 15:33:01 +0000
reviewersbackout, backout
bugs1409900, 590206
milestone58.0a1
backs out83296a355dd49b2822a52b08d0df89e029ea56bc
072007f834314978acf0dc15efd3c3b935b2957e
Backed out 2 changesets (bug 1409900) for failing browser chrome on Linux opt at browser/base/content/test/general/browser_bug590206.js r=backout a=backout. Backed out changeset 83296a355dd4 (bug 1409900) Backed out changeset 072007f83431 (bug 1409900)
security/sandbox/linux/SandboxFilter.cpp
--- a/security/sandbox/linux/SandboxFilter.cpp
+++ b/security/sandbox/linux/SandboxFilter.cpp
@@ -534,49 +534,16 @@ private:
 
   static intptr_t SocketpairDatagramTrap(ArgsRef aArgs, void* aux) {
     auto fds = reinterpret_cast<int*>(aArgs.args[3]);
     // Return sequential packet sockets instead of the expected
     // datagram sockets; see bug 1355274 for details.
     return ConvertError(socketpair(AF_UNIX, SOCK_SEQPACKET, 0, fds));
   }
 
-  static intptr_t StatFsTrap(ArgsRef aArgs, void* aux) {
-    auto path = reinterpret_cast<const char*>(aArgs.args[0]);
-    // *buf could be either struct statfs or struct statfs64,
-    // depending on syscall -- and the kernel ABI structs in
-    // <asm/statfs.h> are not the same as the C API structs in
-    // <sys/statfs.h>.  Since we're not touching any of the fields,
-    // avoid all that and just use void*.
-    auto buf = reinterpret_cast<void*>(aArgs.args[1]);
-
-    int fd = open(path, O_RDONLY);
-    if (fd < 0) {
-      return -errno;
-    }
-
-    intptr_t rv;
-    switch (aArgs.nr) {
-    case __NR_statfs:
-      rv = DoSyscall(__NR_fstatfs, fd, buf);
-      break;
-#ifdef __NR_statfs64
-    case __NR_statfs64:
-      rv = DoSyscall(__NR_fstatfs64, fd, buf);
-      break;
-#endif
-    default:
-      MOZ_ASSERT(false);
-      rv = -ENOSYS;
-    }
-
-    close(fd);
-    return rv;
-  }
-
 public:
   explicit ContentSandboxPolicy(SandboxBrokerClient* aBroker,
                                 const std::vector<int>& aSyscallWhitelist)
     : mBroker(aBroker),
       mSyscallWhitelist(aSyscallWhitelist) {}
   ~ContentSandboxPolicy() override = default;
   Maybe<ResultExpr> EvaluateSocketCall(int aCall) const override {
     switch(aCall) {
@@ -719,23 +686,22 @@ public:
       }
     }
 
     switch (sysno) {
 #ifdef DESKTOP
     case __NR_getppid:
       return Trap(GetPPidTrap, nullptr);
 
-    CASES_FOR_statfs:
-      return Trap(StatFsTrap, nullptr);
-
       // Filesystem syscalls that need more work to determine who's
       // using them, if they need to be, and what we intend to about it.
     case __NR_getcwd:
+    CASES_FOR_statfs:
     CASES_FOR_fstatfs:
+    case __NR_quotactl:
     CASES_FOR_fchown:
     case __NR_fchmod:
     case __NR_flock:
       return Allow();
 
       // Bug 1354731: proprietary GL drivers try to mknod() their devices
     case __NR_mknod: {
       Arg<mode_t> mode(1);