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

am f07a99f9: am 07aca15b: Merge "Better am error when SELinux blocking access." into lmp-mr1-dev

Browse Source 
* commit 'f07a99f9b92878e3570fe1715c701bc4c32d2ad9':
  Better am error when SELinux blocking access.
This commit is contained in:
Jeff Sharkey
2014-11-25 18:43:43 +00:00
committed by Android Git Automerger
parent 351ab57e25 f07a99f9b9
commit bcf57d9d3a
1 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cmds/am/src/com/android/commands/am/Am.java
View File

@@ -47,6 +47,7 @@ import android.os.Bundle;
import android.os.IBinder; import android.os.IBinder;
import android.os.ParcelFileDescriptor; import android.os.ParcelFileDescriptor;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.SELinux;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.os.SystemClock; import android.os.SystemClock;
import android.os.SystemProperties; import android.os.SystemProperties;
@@ -741,13 +742,14 @@ public class Am extends BaseCommand {
if (mProfileFile != null) { if (mProfileFile != null) {
try { try {
fd = ParcelFileDescriptor.open( fd = openForSystemServer(
new File(mProfileFile), new File(mProfileFile),
ParcelFileDescriptor.MODE_CREATE | ParcelFileDescriptor.MODE_CREATE |
ParcelFileDescriptor.MODE_TRUNCATE | ParcelFileDescriptor.MODE_TRUNCATE |
ParcelFileDescriptor.MODE_READ_WRITE); ParcelFileDescriptor.MODE_READ_WRITE);
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
System.err.println("Error: Unable to open file: " + mProfileFile); System.err.println("Error: Unable to open file: " + mProfileFile);
System.err.println("Consider using a file under /data/local/tmp/");
return; return;
} }
profilerInfo = new ProfilerInfo(mProfileFile, fd, mSamplingInterval, mAutoStop); profilerInfo = new ProfilerInfo(mProfileFile, fd, mSamplingInterval, mAutoStop);
@@ -1053,13 +1055,14 @@ public class Am extends BaseCommand {
if (start) { if (start) {
profileFile = nextArgRequired(); profileFile = nextArgRequired();
try { try {
fd = ParcelFileDescriptor.open( fd = openForSystemServer(
new File(profileFile), new File(profileFile),
ParcelFileDescriptor.MODE_CREATE | ParcelFileDescriptor.MODE_CREATE |
ParcelFileDescriptor.MODE_TRUNCATE | ParcelFileDescriptor.MODE_TRUNCATE |
ParcelFileDescriptor.MODE_READ_WRITE); ParcelFileDescriptor.MODE_READ_WRITE);
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
System.err.println("Error: Unable to open file: " + profileFile); System.err.println("Error: Unable to open file: " + profileFile);
System.err.println("Consider using a file under /data/local/tmp/");
return; return;
} }
profilerInfo = new ProfilerInfo(profileFile, fd, 0, false); profilerInfo = new ProfilerInfo(profileFile, fd, 0, false);
@@ -1113,12 +1116,13 @@ public class Am extends BaseCommand {
try { try {
File file = new File(heapFile); File file = new File(heapFile);
file.delete(); file.delete();
fd = ParcelFileDescriptor.open(file, fd = openForSystemServer(file,
ParcelFileDescriptor.MODE_CREATE | ParcelFileDescriptor.MODE_CREATE |
ParcelFileDescriptor.MODE_TRUNCATE | ParcelFileDescriptor.MODE_TRUNCATE |
ParcelFileDescriptor.MODE_READ_WRITE); ParcelFileDescriptor.MODE_READ_WRITE);
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
System.err.println("Error: Unable to open file: " + heapFile); System.err.println("Error: Unable to open file: " + heapFile);
System.err.println("Consider using a file under /data/local/tmp/");
return; return;
} }
@@ -1855,4 +1859,18 @@ public class Am extends BaseCommand {
} catch (RemoteException e) { } catch (RemoteException e) {
} }
} }
/**
* Open the given file for sending into the system process. This verifies
* with SELinux that the system will have access to the file.
*/
private static ParcelFileDescriptor openForSystemServer(File file, int mode)
throws FileNotFoundException {
final ParcelFileDescriptor fd = ParcelFileDescriptor.open(file, mode);
final String tcon = SELinux.getFileContext(file.getAbsolutePath());
if (!SELinux.checkSELinuxAccess("u:r:system_server:s0", tcon, "file", "read")) {
throw new FileNotFoundException("System server has no access to file context " + tcon);
}
return fd;
}
} }