diff options
| author | Chad Brubaker <cbrubaker@google.com> | 2017-02-24 21:54:22 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-24 21:54:22 +0000 |
| commit | 4419e1e539ee3d78dbba33437be4b752b50b3519 (patch) | |
| tree | aab817c75a1d39c3acf03ec2293c6f929097ef81 | |
| parent | 1f7f14eb2037d244b316c4b0362fb33788179f1b (diff) | |
| parent | 9a7e29fe91a6d3870ea64d381a6a909096f3ed15 (diff) | |
| download | selinux-4419e1e539ee3d78dbba33437be4b752b50b3519.tar.gz | |
Merge "Check values for various is* when determining dups"
am: 9a7e29fe91
Change-Id: If0f408673674d3c7a4870378e6114ca753ed6bbf
| -rw-r--r-- | libselinux/src/android/android.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libselinux/src/android/android.c b/libselinux/src/android/android.c index d5f14842..a5c5a6f0 100644 --- a/libselinux/src/android/android.c +++ b/libselinux/src/android/android.c @@ -238,7 +238,13 @@ static int seapp_context_cmp(const void *A, const void *B) dup = (!s1->user.str || !strcmp(s1->user.str, s2->user.str)) && (!s1->seinfo || !strcmp(s1->seinfo, s2->seinfo)) && (!s1->name.str || !strcmp(s1->name.str, s2->name.str)) && - (!s1->path.str || !strcmp(s1->path.str, s2->path.str)); + (!s1->path.str || !strcmp(s1->path.str, s2->path.str)) && + (s1->isPrivAppSet && s1->isPrivApp == s2->isPrivApp) && + (s1->isOwnerSet && s1->isOwner == s2->isOwner) && + (s1->isSystemServer && s1->isSystemServer == s2->isSystemServer) && + (s1->isV2AppSet && s1->isV2App == s2->isV2App) && + (s1->isEphemeralAppSet && s1->isEphemeralApp == s2->isEphemeralApp); + if (dup) { seapp_contexts_dup = true; selinux_log(SELINUX_ERROR, "seapp_contexts: Duplicated entry\n"); |