Merge "Zygote: Fix dropping capabilities in containers"

2023-03-20 09:24:28 +00:00
parent 415be6e357 cf2a3f6eb5
commit 7175772689
1 changed files with 2 additions and 1 deletions
--- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/core/java/com/android/internal/os/ZygoteInit.java
@@ -721,7 +721,8 @@ public class ZygoteInit {
        } catch (ErrnoException ex) {
            throw new RuntimeException("Failed to capget()", ex);
        }
-        capabilities &= ((long) data[0].effective) | (((long) data[1].effective) << 32);
+        capabilities &= Integer.toUnsignedLong(data[0].effective) |
+                (Integer.toUnsignedLong(data[1].effective) << 32);

        /* Hardcoded command line to start the system server */
        String[] args = {