Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Return correct errno."

Browse Source
This commit is contained in:
TreeHugger Robot
2022-09-01 05:51:11 +00:00
committed by Android (Google) Code Review
parent 5b5e0941fa b21396f77d
commit e346a420f3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/jni/com_android_internal_security_VerityUtils.cpp
View File

@@ -111,10 +111,10 @@ int measureFsverity(JNIEnv *env, jobject /* clazz */, jstring filePath, jbyteArr
ScopedUtfChars path(env, filePath);
::android::base::unique_fd rfd(open(path.c_str(), O_RDONLY | O_CLOEXEC));
if (rfd.get() < 0) {
return rfd.get();
return -errno;
}
if (auto err = ioctl(rfd.get(), FS_IOC_MEASURE_VERITY, data); err < 0) {
return err;
if (::ioctl(rfd.get(), FS_IOC_MEASURE_VERITY, data) < 0) {
return -errno;
}
if (data->digest_algorithm != FS_VERITY_HASH_ALG_SHA256) {