diff options
| -rw-r--r-- | core/jni/com_android_internal_security_VerityUtils.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/jni/com_android_internal_security_VerityUtils.cpp b/core/jni/com_android_internal_security_VerityUtils.cpp index c5b3d8ae936c..8305bd087bfd 100644 --- a/core/jni/com_android_internal_security_VerityUtils.cpp +++ b/core/jni/com_android_internal_security_VerityUtils.cpp @@ -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) { |