ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "libcutils: fs_config: target_out_path assumed /system breaking partitions"

Browse source 
am: e800b97c46

Change-Id: Ie4114f6e1439e60ca7ae8f72e4feddaa31e7d231
This commit is contained in:
Mark Salyzyn 2017-04-07 19:34:05 +00:00 • committed by android-build-merger
commit 0c7f2287aa
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
libcutils/fs_config.c
View file

@ -227,21 +227,24 @@ static const struct fs_path_config android_files[] = {
/* clang-format on */
};
static size_t strip(const char* path, size_t len, const char suffix[]) {
if (len < strlen(suffix)) return len;
if (strncmp(path + len - strlen(suffix), suffix, strlen(suffix))) return len;
return len - strlen(suffix);
}
static int fs_config_open(int dir, int which, const char* target_out_path) {
int fd = -1;
if (target_out_path && *target_out_path) {
/* target_out_path is the path to the directory holding content of
* system partition but as we cannot guaranty it ends with '/system'
* we need this below skip_len logic */
* system partition but as we cannot guarantee it ends with '/system'
* or with or without a trailing slash, need to strip them carefully. */
char* name = NULL;
int target_out_path_len = strlen(target_out_path);
int skip_len = strlen("/system");
if (target_out_path[target_out_path_len] == '/') {
skip_len++;
}
if (asprintf(&name, "%s%s", target_out_path, conf[which][dir] + skip_len) != -1) {
size_t len = strlen(target_out_path);
len = strip(target_out_path, len, "/");
len = strip(target_out_path, len, "/system");
if (asprintf(&name, "%.*s%s", (int)len, target_out_path, conf[which][dir]) != -1) {
fd = TEMP_FAILURE_RETRY(open(name, O_RDONLY | O_BINARY));
free(name);
}