diff options
| author | Nick Kralevich <nnk@google.com> | 2014-10-24 19:43:15 +0200 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-24 19:43:15 +0200 |
| commit | 915d661ccc64f25a533919054f487a8e5943574d (patch) | |
| tree | 5b661997431ff4cddfbd590046e418fad1f4b8fa | |
| parent | am 168f7778: Allow passing of mount args to mountFn (diff) | |
| parent | unconditionally apply SELinux labels to symlinks (diff) | |
| download | android_bootable_recovery-915d661ccc64f25a533919054f487a8e5943574d.tar android_bootable_recovery-915d661ccc64f25a533919054f487a8e5943574d.tar.gz android_bootable_recovery-915d661ccc64f25a533919054f487a8e5943574d.tar.bz2 android_bootable_recovery-915d661ccc64f25a533919054f487a8e5943574d.tar.lz android_bootable_recovery-915d661ccc64f25a533919054f487a8e5943574d.tar.xz android_bootable_recovery-915d661ccc64f25a533919054f487a8e5943574d.tar.zst android_bootable_recovery-915d661ccc64f25a533919054f487a8e5943574d.zip | |
| -rw-r--r-- | updater/install.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/updater/install.c b/updater/install.c index 282a6188b..db2bd3295 100644 --- a/updater/install.c +++ b/updater/install.c @@ -770,9 +770,17 @@ static int ApplyParsedPerms( { int bad = 0; + if (parsed.has_selabel) { + if (lsetfilecon(filename, parsed.selabel) != 0) { + uiPrintf(state, "ApplyParsedPerms: lsetfilecon of %s to %s failed: %s\n", + filename, parsed.selabel, strerror(errno)); + bad++; + } + } + /* ignore symlinks */ if (S_ISLNK(statptr->st_mode)) { - return 0; + return bad; } if (parsed.has_uid) { @@ -815,15 +823,6 @@ static int ApplyParsedPerms( } } - if (parsed.has_selabel) { - // TODO: Don't silently ignore ENOTSUP - if (lsetfilecon(filename, parsed.selabel) && (errno != ENOTSUP)) { - uiPrintf(state, "ApplyParsedPerms: lsetfilecon of %s to %s failed: %s\n", - filename, parsed.selabel, strerror(errno)); - bad++; - } - } - if (parsed.has_capabilities && S_ISREG(statptr->st_mode)) { if (parsed.capabilities == 0) { if ((removexattr(filename, XATTR_NAME_CAPS) == -1) && (errno != ENODATA)) { |