diff options
author | Tom Cherry <tomcherry@google.com> | 2019-05-08 15:31:28 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-05-08 15:31:28 +0000 |
commit | 766e878253edea3706a0aed57555b2e06ba530a6 (patch) | |
tree | 82b445fbbcb8a5ccca66f626bdd545dbcb811014 | |
parent | 3e182b6170c818ce454e5ee9641c8e6824a9b53e (diff) | |
parent | a8eb00720ca0ea02ace5942e54860c07ca35a14f (diff) | |
download | core-766e878253edea3706a0aed57555b2e06ba530a6.tar.gz |
Merge "Add default executable permission in odm/bin"
-rw-r--r-- | libcutils/fs_config.cpp | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/libcutils/fs_config.cpp b/libcutils/fs_config.cpp index 9d8fa9546..494a06f53 100644 --- a/libcutils/fs_config.cpp +++ b/libcutils/fs_config.cpp @@ -214,6 +214,7 @@ static const struct fs_path_config android_files[] = { { 00755, AID_ROOT, AID_ROOT, 0, "bin/*" }, { 00640, AID_ROOT, AID_SHELL, 0, "fstab.*" }, { 00750, AID_ROOT, AID_SHELL, 0, "init*" }, + { 00755, AID_ROOT, AID_SHELL, 0, "odm/bin/*" }, { 00755, AID_ROOT, AID_SHELL, 0, "product/bin/*" }, { 00755, AID_ROOT, AID_SHELL, 0, "system/bin/*" }, { 00755, AID_ROOT, AID_SHELL, 0, "system/xbin/*" }, @@ -292,20 +293,21 @@ static bool fs_config_cmp(bool dir, const char* prefix, size_t len, const char* const int fnm_flags = FNM_NOESCAPE; if (fnmatch(pattern.c_str(), input.c_str(), fnm_flags) == 0) return true; - static constexpr const char* kSystem = "system/"; - if (StartsWith(input, kSystem)) { - input.erase(0, strlen(kSystem)); - } else if (input.size() <= strlen(kSystem)) { - return false; - } else if (StartsWith(pattern, kSystem)) { - pattern.erase(0, strlen(kSystem)); - } else { - return false; + // Check match between logical partition's files and patterns. + static constexpr const char* kLogicalPartitions[] = {"system/product/", + "system/product_services/", + "system/vendor/", + "vendor/odm/"}; + for (auto& logical_partition : kLogicalPartitions) { + if (StartsWith(input, logical_partition)) { + std::string input_in_partition = input.substr(input.find('/') + 1); + if (!is_partition(input_in_partition)) continue; + if (fnmatch(pattern.c_str(), input_in_partition.c_str(), fnm_flags) == 0) { + return true; + } + } } - - if (!is_partition(pattern)) return false; - if (!is_partition(input)) return false; - return fnmatch(pattern.c_str(), input.c_str(), fnm_flags) == 0; + return false; } #ifndef __ANDROID_VNDK__ auto __for_testing_only__fs_config_cmp = fs_config_cmp; |