openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

am: ebc87c98e3

Change-Id: I8b35923c397d8293c1054e103296add4508db472
This commit is contained in:
Mark Salyzyn 2017-04-06 17:42:39 +00:00 committed by android-build-merger
parent 5358155528 ebc87c98e3
commit d7acf56639
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,