ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "logd: test: logd.sepolicy* errors" am: ebc87c98e3

Browse source 
am: d7acf56639

Change-Id: I9a082d481c0b277f0c9ce8e79d16edd7c4b08a1a
This commit is contained in:
Mark Salyzyn 2017-04-06 17:46:04 +00:00 • committed by android-build-merger
commit ef3ee4008f
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
logd/tests/logd_test.cpp
View file

@ -999,16 +999,18 @@ static pid_t sepolicy_rate(unsigned rate, unsigned num) {
}
// We may have DAC, but let's not have MAC
if (setcon("u:object_r:shell:s0") < 0) {
if ((setcon("u:object_r:shell:s0") < 0) && (setcon("u:r:shell:s0") < 0)) {
int save_errno = errno;
security_context_t context;
getcon(&context);
fprintf(stderr, "setcon(\"u:r:shell:s0\") failed @\"%s\" %s\n", context,
strerror(save_errno));
freecon(context);
_exit(-1);
// NOTREACHED
return 0;
if (strcmp(context, "u:r:shell:s0")) {
fprintf(stderr, "setcon(\"u:r:shell:s0\") failed @\"%s\" %s\n",
context, strerror(save_errno));
freecon(context);
_exit(-1);
// NOTREACHED
return 0;
}
}
// The key here is we are root, but we are in u:r:shell:s0,