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

Fix JNI misuse during fs-verity setup

Browse Source 
jByteArray can't be used directly.

Test: atest com.android.apkverity.ApkVerityTest
Bug: 142504243
Change-Id: I65f45e72412c62330d573c4245cff7ad78c96c20
This commit is contained in:
Victor Hsieh
2019-10-10 16:09:21 -07:00
parent 2173ac60d7
commit 561e2861df
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/jni/com_android_server_security_VerityUtils.cpp
View File

@@ -17,6 +17,7 @@
#define LOG_TAG "VerityUtils"
#include <nativehelper/JNIHelp.h>
#include <nativehelper/ScopedPrimitiveArray.h>
#include "jni.h"
#include <utils/Log.h>
@@ -78,6 +79,10 @@ int enableFsverity(JNIEnv* env, jobject /* clazz */, jstring filePath, jbyteArra
if (rfd.get() < 0) {
return errno;
}
ScopedByteArrayRO signature_bytes(env, signature);
if (signature_bytes.get() == nullptr) {
return EINVAL;
}
fsverity_enable_arg arg = {};
arg.version = 1;
@@ -85,8 +90,8 @@ int enableFsverity(JNIEnv* env, jobject /* clazz */, jstring filePath, jbyteArra
arg.block_size = 4096;
arg.salt_size = 0;
arg.salt_ptr = reinterpret_cast<uintptr_t>(nullptr);
arg.sig_size = env->GetArrayLength(signature);
arg.sig_ptr = reinterpret_cast<uintptr_t>(signature);
arg.sig_size = signature_bytes.size();
arg.sig_ptr = reinterpret_cast<uintptr_t>(signature_bytes.get());
if (ioctl(rfd.get(), FS_IOC_ENABLE_VERITY, &arg) < 0) {
return errno;