Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e31e9d3e authored by vichang's avatar vichang Committed by Automerger Merge Worker
Browse files

Merge "Revert "Refactor StructCapUser{Header,Data} and StructLinger for API... 

Merge "Revert "Refactor StructCapUser{Header,Data} and StructLinger for API review"" am: 789d8306 am: 820ca1a1 am: 406a3127 am: f29eb38d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1744717

Change-Id: If943145ee58e515e38f6d7ed85bd10ea3680faad
parents ecc94aaa f29eb38d

core/java/com/android/internal/os/WrapperInit.java

+6 −6
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ import android.os.Trace; 
import android.system.ErrnoException;

import android.system.Os;

import android.system.OsConstants;

import android.system.StructUserCapData;

import android.system.StructUserCapHeader;

import android.system.StructCapUserData;

import android.system.StructCapUserHeader;

import android.util.Slog;

import android.util.TimingsTraceLog;
@@ -187,9 +187,9 @@ public class WrapperInit { 
     *       capabilities, which may make it crash, but not exceed its allowances.

     */

    private static void preserveCapabilities() {

        StructUserCapHeader header = new StructUserCapHeader(

        StructCapUserHeader header = new StructCapUserHeader(

                OsConstants._LINUX_CAPABILITY_VERSION_3, 0);

        StructUserCapData[] data;

        StructCapUserData[] data;

        try {

            data = Os.capget(header);

        } catch (ErrnoException e) {
@@ -199,9 +199,9 @@ public class WrapperInit { 


        if (data[0].permitted != data[0].inheritable ||

                data[1].permitted != data[1].inheritable) {

            data[0] = new StructUserCapData(data[0].effective, data[0].permitted,

            data[0] = new StructCapUserData(data[0].effective, data[0].permitted,

                    data[0].permitted);

            data[1] = new StructUserCapData(data[1].effective, data[1].permitted,

            data[1] = new StructCapUserData(data[1].effective, data[1].permitted,

                    data[1].permitted);

            try {

                Os.capset(header, data);

core/java/com/android/internal/os/ZygoteInit.java

+4 −4
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ import android.security.keystore2.AndroidKeyStoreProvider; 
import android.system.ErrnoException;

import android.system.Os;

import android.system.OsConstants;

import android.system.StructUserCapData;

import android.system.StructUserCapHeader;

import android.system.StructCapUserData;

import android.system.StructCapUserHeader;

import android.text.Hyphenator;

import android.util.EventLog;

import android.util.Log;
@@ -747,9 +747,9 @@ public class ZygoteInit { 
                OsConstants.CAP_BLOCK_SUSPEND

        );

        /* Containers run without some capabilities, so drop any caps that are not available. */

        StructUserCapHeader header = new StructUserCapHeader(

        StructCapUserHeader header = new StructCapUserHeader(

                OsConstants._LINUX_CAPABILITY_VERSION_3, 0);

        StructUserCapData[] data;

        StructCapUserData[] data;

        try {

            data = Os.capget(header);

        } catch (ErrnoException ex) {