diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-23 00:38:50 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-23 00:38:50 +0000 |
| commit | 9b09abc7dde9abc6adb65cab2b5fdba2a5ebe013 (patch) | |
| tree | 2ecfaa19bf4dc146728098ded1660548910f9344 | |
| parent | e94b487ecd560c5be49868657381a81c3590b743 (diff) | |
| parent | c4d3d93c335fbcd34b589b008ee27e5a2a590a43 (diff) | |
| download | selinux-android10-mainline-a-release.tar.gz | |
Snap for 5571616 from c4d3d93c335fbcd34b589b008ee27e5a2a590a43 to qt-aml-releaseandroid-mainline-10.0.0_r3android-mainline-10.0.0_r2android-mainline-10.0.0_r1android10-mainline-releaseandroid10-mainline-a-release
Change-Id: I50a840fe5f59e1593cab8d77f426ee43934e3ef9
| -rw-r--r-- | libselinux/src/android/android_platform.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libselinux/src/android/android_platform.c b/libselinux/src/android/android_platform.c index c0e60440..83a795a7 100644 --- a/libselinux/src/android/android_platform.c +++ b/libselinux/src/android/android_platform.c @@ -1324,6 +1324,7 @@ struct pkg_info *package_info_lookup(const char *name) * to delay restorecon of those until vold explicitly requests it. */ // NOTE: these paths need to be kept in sync with vold #define DATA_SYSTEM_CE_PREFIX "/data/system_ce/" +#define DATA_VENDOR_CE_PREFIX "/data/vendor_ce/" #define DATA_MISC_CE_PREFIX "/data/misc_ce/" /* The path prefixes of package data directories. */ @@ -1713,7 +1714,8 @@ static int selinux_android_restorecon_common(const char* pathname_orig, if (skipce && (!strncmp(ftsent->fts_path, DATA_SYSTEM_CE_PREFIX, sizeof(DATA_SYSTEM_CE_PREFIX)-1) || - !strncmp(ftsent->fts_path, DATA_MISC_CE_PREFIX, sizeof(DATA_MISC_CE_PREFIX)-1))) { + !strncmp(ftsent->fts_path, DATA_MISC_CE_PREFIX, sizeof(DATA_MISC_CE_PREFIX)-1) || + !strncmp(ftsent->fts_path, DATA_VENDOR_CE_PREFIX, sizeof(DATA_VENDOR_CE_PREFIX)-1))) { // Don't label anything below this directory. fts_set(fts, ftsent, FTS_SKIP); // but fall through and make sure we label the directory itself |