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

Commit b21396f7 authored by Alex Buynytskyy's avatar Alex Buynytskyy
Browse files

Return correct errno. 

Bug: 160605420
Test: atest ChecksumsTest; adb logcat | grep "fs-verity"
Change-Id: Ie3cc04ff085d707a7acc32ce808fe5eb2770e8e7
parent 223d8c46

core/jni/com_android_internal_security_VerityUtils.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -111,10 +111,10 @@ int measureFsverity(JNIEnv *env, jobject /* clazz */, jstring filePath, jbyteArr 
    ScopedUtfChars path(env, filePath);

    ScopedUtfChars path(env, filePath);

    ::android::base::unique_fd rfd(open(path.c_str(), O_RDONLY | O_CLOEXEC));

    ::android::base::unique_fd rfd(open(path.c_str(), O_RDONLY | O_CLOEXEC));

    if (rfd.get() < 0) {

    if (rfd.get() < 0) {

        return rfd.get();

        return -errno;

    }

    }

    if (auto err = ioctl(rfd.get(), FS_IOC_MEASURE_VERITY, data); err < 0) {

    if (::ioctl(rfd.get(), FS_IOC_MEASURE_VERITY, data) < 0) {

        return err;

        return -errno;

    }

    }





    if (data->digest_algorithm != FS_VERITY_HASH_ALG_SHA256) {

    if (data->digest_algorithm != FS_VERITY_HASH_ALG_SHA256) {