Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e346a420 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Return correct errno."

parents 5b5e0941 b21396f7

core/jni/com_android_internal_security_VerityUtils.cpp

+3 −3
Original line number Diff line number Diff line
@@ -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) {