diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-04-30 21:46:14 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-04-30 21:46:14 +0000 |
| commit | 0077da86b630bcd6bfd6db90af78d279a54e8422 (patch) | |
| tree | 3022a1cc40a1bf376702a8dd1ab243d76f6d9b00 | |
| parent | 131f4bfcf54b990bda60fea4dd61d10b9c1d3cf7 (diff) | |
| parent | 261afd394b622a6d9d639978dffcfde84967788c (diff) | |
| download | selinux-0077da86b630bcd6bfd6db90af78d279a54e8422.tar.gz | |
Snap for 11784721 from 261afd394b622a6d9d639978dffcfde84967788c to build-tools-release
Change-Id: I523d0f7240c0fff8f9590e859bafbcbf6338fabe
| -rw-r--r-- | checkpolicy/checkpolicy.c | 5 | ||||
| -rw-r--r-- | libselinux/src/android/android_device.c | 12 |
2 files changed, 17 insertions, 0 deletions
diff --git a/checkpolicy/checkpolicy.c b/checkpolicy/checkpolicy.c index 48c31261..8705d44d 100644 --- a/checkpolicy/checkpolicy.c +++ b/checkpolicy/checkpolicy.c @@ -92,6 +92,11 @@ #include "checkpolicy.h" #include "parse_util.h" +// ANDROID: this code does not call policydb_destroy, perhaps others +const char *__asan_default_options() { + return "detect_leaks=0"; +} + static policydb_t policydb; static sidtab_t sidtab; diff --git a/libselinux/src/android/android_device.c b/libselinux/src/android/android_device.c index 63f3355b..df110739 100644 --- a/libselinux/src/android/android_device.c +++ b/libselinux/src/android/android_device.c @@ -257,6 +257,7 @@ struct pkg_info *package_info_lookup(const char *name) #define DATA_DATA_PATH "/data/data" #define DATA_USER_PATH "/data/user" #define DATA_USER_DE_PATH "/data/user_de" +#define DATA_STORAGE_AREA_PATH "/data/storage_area" #define USER_PROFILE_PATH "/data/misc/profiles/cur/*" #define SDK_SANDBOX_DATA_CE_PATH "/data/misc_ce/*/sdksandbox" #define SDK_SANDBOX_DATA_DE_PATH "/data/misc_de/*/sdksandbox" @@ -270,6 +271,7 @@ struct pkg_info *package_info_lookup(const char *name) #define DATA_DATA_PREFIX DATA_DATA_PATH "/" #define DATA_USER_PREFIX DATA_USER_PATH "/" #define DATA_USER_DE_PREFIX DATA_USER_DE_PATH "/" +#define DATA_STORAGE_AREA_PREFIX DATA_STORAGE_AREA_PATH "/" #define DATA_MISC_CE_PREFIX DATA_MISC_CE_PATH "/" #define DATA_MISC_DE_PREFIX DATA_MISC_DE_PATH "/" #define EXPAND_MNT_PATH_PREFIX EXPAND_MNT_PATH "/" @@ -289,6 +291,7 @@ static bool is_app_data_path(const char *pathname) { return (!strncmp(pathname, DATA_DATA_PREFIX, sizeof(DATA_DATA_PREFIX)-1) || !strncmp(pathname, DATA_USER_PREFIX, sizeof(DATA_USER_PREFIX)-1) || !strncmp(pathname, DATA_USER_DE_PREFIX, sizeof(DATA_USER_DE_PREFIX)-1) || + !strncmp(pathname, DATA_STORAGE_AREA_PREFIX, sizeof(DATA_STORAGE_AREA_PREFIX)-1) || !fnmatch(EXPAND_USER_PATH, pathname, flags) || !fnmatch(EXPAND_USER_DE_PATH, pathname, flags) || !fnmatch(SDK_SANDBOX_DATA_CE_PATH, pathname, flags) || @@ -357,6 +360,15 @@ static int extract_pkgname_and_userid(const char *pathname, char **pkgname, unsi pathname++; else return -1; + } else if (!strncmp(pathname, DATA_STORAGE_AREA_PREFIX, sizeof(DATA_STORAGE_AREA_PREFIX)-1)) { + pathname += sizeof(DATA_STORAGE_AREA_PREFIX) - 1; + int rc = extract_userid(&pathname, userid); + if (rc) + return -1; + if (*pathname == '/') + pathname++; + else + return -1; } else if (!fnmatch(EXPAND_USER_PATH, pathname, FNM_LEADING_DIR|FNM_PATHNAME)) { pathname += sizeof(EXPAND_USER_PATH); int rc = extract_userid(&pathname, userid); |