From a7f4fc9162c4098d76e5d6ea2af57773af3f2c28 Mon Sep 17 00:00:00 2001 From: Dylan Reid Date: Thu, 13 Jul 2017 18:45:23 -0700 Subject: Use unsigned long for prctl argument uint64_t isn't the right type when running on a 32 bit machine. BUG=none TEST=check caps can be dropped on a 32 bit userspace machine like kevin. minijail0 -u wpa -g wpa -c 3000 -i -t -- /bin/ls Change-Id: I1ec55dc653fe206a1641f0a971ab2b20c42a2d9c Signed-off-by: Dylan Reid --- system.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system.c b/system.c index 9373e87..5dbcf54 100644 --- a/system.c +++ b/system.c @@ -59,7 +59,7 @@ int lock_securebits(uint64_t skip_mask) * need to lock the NO_CAP_AMBIENT_RAISE securebit, since we are already * configuring the permitted and inheritable set. */ - uint64_t securebits = + unsigned long securebits = (SECURE_BITS_NO_AMBIENT | SECURE_LOCKS_NO_AMBIENT) & ~skip_mask; if (!securebits) { return 0; -- cgit v1.2.3 From db19bfbfbdce0f2b86f53d36392e49cb8f1645d6 Mon Sep 17 00:00:00 2001 From: Jorge Lucangeli Obes Date: Fri, 14 Jul 2017 10:51:25 -0400 Subject: Add LICENSE file. When moving Minijail from Chrome OS to Android, we lost the LICENSE file: https://chromium.git.corp.google.com/chromiumos/platform2/+/master/LICENSE Add it back in. Bug: None Test: None Change-Id: I9fb7ecdccc35a62482a90e9500a71970de08205d --- LICENSE | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..e0967d1 --- /dev/null +++ b/LICENSE @@ -0,0 +1,28 @@ +/* Copyright 2012 The Chromium OS Authors. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ -- cgit v1.2.3