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

Commit 561e2861 authored by Victor Hsieh's avatar Victor Hsieh
Browse files

Fix JNI misuse during fs-verity setup 

jByteArray can't be used directly.

Test: atest com.android.apkverity.ApkVerityTest
Bug: 142504243
Change-Id: I65f45e72412c62330d573c4245cff7ad78c96c20
parent 2173ac60

services/core/jni/com_android_server_security_VerityUtils.cpp

+7 −2
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ 
#define LOG_TAG "VerityUtils"

#define LOG_TAG "VerityUtils"





#include <nativehelper/JNIHelp.h>

#include <nativehelper/JNIHelp.h>

#include <nativehelper/ScopedPrimitiveArray.h>

#include "jni.h"

#include "jni.h"

#include <utils/Log.h>

#include <utils/Log.h>
@@ -78,6 +79,10 @@ int enableFsverity(JNIEnv* env, jobject /* clazz */, jstring filePath, jbyteArra 
    if (rfd.get() < 0) {

    if (rfd.get() < 0) {

      return errno;

      return errno;

    }

    }

    ScopedByteArrayRO signature_bytes(env, signature);

    if (signature_bytes.get() == nullptr) {

        return EINVAL;

    }





    fsverity_enable_arg arg = {};

    fsverity_enable_arg arg = {};

    arg.version = 1;

    arg.version = 1;
@@ -85,8 +90,8 @@ int enableFsverity(JNIEnv* env, jobject /* clazz */, jstring filePath, jbyteArra 
    arg.block_size = 4096;

    arg.block_size = 4096;

    arg.salt_size = 0;

    arg.salt_size = 0;

    arg.salt_ptr = reinterpret_cast<uintptr_t>(nullptr);

    arg.salt_ptr = reinterpret_cast<uintptr_t>(nullptr);

    arg.sig_size = env->GetArrayLength(signature);

    arg.sig_size = signature_bytes.size();

    arg.sig_ptr = reinterpret_cast<uintptr_t>(signature);

    arg.sig_ptr = reinterpret_cast<uintptr_t>(signature_bytes.get());





    if (ioctl(rfd.get(), FS_IOC_ENABLE_VERITY, &arg) < 0) {

    if (ioctl(rfd.get(), FS_IOC_ENABLE_VERITY, &arg) < 0) {

      return errno;

      return errno;