diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-24 07:22:41 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-24 07:22:41 +0000 |
commit | a4c6bbd8cbf27b6b33aed46eb163a58299d094b5 (patch) | |
tree | 0af6df937a0d8d2b372db6aa3c1c8ec1af437ab4 | |
parent | 0f4f2c08ed3cc895134b306c3bbe96aac42e3c5d (diff) | |
parent | 932eb00d242d4bbb8fedbf07fe8cefd7b4b70ac9 (diff) | |
download | extras-a4c6bbd8cbf27b6b33aed46eb163a58299d094b5.tar.gz |
Snap for 4801384 from 932eb00d242d4bbb8fedbf07fe8cefd7b4b70ac9 to pi-releaseandroid-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r1android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r1security-pi-releasepie-security-releasepie-r2-s1-releasepie-r2-release
Change-Id: Iabfafb7b9a3201281abb56b7bc3f6e4e750ae0f1
-rw-r--r-- | ext4_utils/ext4_crypt.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/ext4_utils/ext4_crypt.cpp b/ext4_utils/ext4_crypt.cpp index bdf80b09..5ec8723b 100644 --- a/ext4_utils/ext4_crypt.cpp +++ b/ext4_utils/ext4_crypt.cpp @@ -76,21 +76,23 @@ bool e4crypt_is_native() { return !strcmp(value, "file"); } -static void log_lslr(const char* dirname) { - std::array<const char*, 3> argv = {"ls", "-lR", dirname}; +static void log_ls(const char* dirname) { + std::array<const char*, 3> argv = {"ls", "-laZ", dirname}; int status = 0; auto res = android_fork_execvp(argv.size(), const_cast<char**>(argv.data()), &status, false, true); if (res != 0) { - PLOG(ERROR) << "ls -lR " << dirname << "failed"; + PLOG(ERROR) << argv[0] << " " << argv[1] << " " << argv[2] << "failed"; return; } if (!WIFEXITED(status)) { - LOG(ERROR) << "ls -lR " << dirname << " did not exit normally, status: " << status; + LOG(ERROR) << argv[0] << " " << argv[1] << " " << argv[2] + << " did not exit normally, status: " << status; return; } if (WEXITSTATUS(status) != 0) { - LOG(ERROR) << "ls -lR " << dirname << " returned failure: " << WEXITSTATUS(status); + LOG(ERROR) << argv[0] << " " << argv[1] << " " << argv[2] + << " returned failure: " << WEXITSTATUS(status); return; } } @@ -201,7 +203,7 @@ static bool e4crypt_policy_get(const char *directory, char *policy, if (ioctl(fd, EXT4_IOC_GET_ENCRYPTION_POLICY, &eep) != 0) { PLOG(ERROR) << "Failed to get encryption policy for " << directory; close(fd); - log_lslr(directory); + log_ls(directory); return false; } close(fd); @@ -240,7 +242,7 @@ static bool e4crypt_policy_check(const char *directory, const char *policy, policy_to_hex(policy, policy_hex); LOG(ERROR) << "Found policy " << existing_policy_hex << " at " << directory << " which doesn't match expected value " << policy_hex; - log_lslr(directory); + log_ls(directory); return false; } LOG(INFO) << "Found policy " << existing_policy_hex << " at " << directory |