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

Return correct errno.

Browse Source 
Bug: 160605420
Test: atest ChecksumsTest; adb logcat | grep "fs-verity"
Change-Id: Ie3cc04ff085d707a7acc32ce808fe5eb2770e8e7
This commit is contained in:
Alex Buynytskyy
2022-08-31 09:02:00 -07:00
parent 223d8c4679
commit b21396f77d
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) {