Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
vichang
2021-06-24 14:55:32 +00:00
committed by Gerrit Code Review
parent f9eb7b947a 9a285e79f3
commit 789d83065b
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/com/android/internal/os/WrapperInit.java
View File

@@ -21,8 +21,8 @@ import android.os.Trace;
import android.system.ErrnoException; import android.system.ErrnoException;
import android.system.Os; import android.system.Os;
import android.system.OsConstants; import android.system.OsConstants;
import android.system.StructUserCapData; import android.system.StructCapUserData;
import android.system.StructUserCapHeader; import android.system.StructCapUserHeader;
import android.util.Slog; import android.util.Slog;
import android.util.TimingsTraceLog; import android.util.TimingsTraceLog;
@@ -187,9 +187,9 @@ public class WrapperInit {
* capabilities, which may make it crash, but not exceed its allowances. * capabilities, which may make it crash, but not exceed its allowances.
*/ */
private static void preserveCapabilities() { private static void preserveCapabilities() {
StructUserCapHeader header = new StructUserCapHeader( StructCapUserHeader header = new StructCapUserHeader(
OsConstants._LINUX_CAPABILITY_VERSION_3, 0); OsConstants._LINUX_CAPABILITY_VERSION_3, 0);
StructUserCapData[] data; StructCapUserData[] data;
try { try {
data = Os.capget(header); data = Os.capget(header);
} catch (ErrnoException e) { } catch (ErrnoException e) {
@@ -199,9 +199,9 @@ public class WrapperInit {
if (data[0].permitted != data[0].inheritable || if (data[0].permitted != data[0].inheritable ||
data[1].permitted != data[1].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[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); data[1].permitted);
try { try {
Os.capset(header, data); Os.capset(header, data);

8
core/java/com/android/internal/os/ZygoteInit.java
View File

@@ -45,8 +45,8 @@ import android.security.keystore2.AndroidKeyStoreProvider;
import android.system.ErrnoException; import android.system.ErrnoException;
import android.system.Os; import android.system.Os;
import android.system.OsConstants; import android.system.OsConstants;
import android.system.StructUserCapData; import android.system.StructCapUserData;
import android.system.StructUserCapHeader; import android.system.StructCapUserHeader;
import android.text.Hyphenator; import android.text.Hyphenator;
import android.util.EventLog; import android.util.EventLog;
import android.util.Log; import android.util.Log;
@@ -750,9 +750,9 @@ public class ZygoteInit {
OsConstants.CAP_BLOCK_SUSPEND OsConstants.CAP_BLOCK_SUSPEND
); );
/* Containers run without some capabilities, so drop any caps that are not available. */ /* 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); OsConstants._LINUX_CAPABILITY_VERSION_3, 0);
StructUserCapData[] data; StructCapUserData[] data;
try { try {
data = Os.capget(header); data = Os.capget(header);
} catch (ErrnoException ex) { } catch (ErrnoException ex) {