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

Merge "VerityUtils: handle ENOTTY from FS_IOC_GETFLAGS"

Browse Source
This commit is contained in:
Eric Biggers
2023-05-18 20:30:20 +00:00
committed by Gerrit Code Review
parent 8b8ef77fb4 2884c77232
commit 30c50ce584
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/jni/com_android_internal_security_VerityUtils.cpp
View File

@@ -79,7 +79,11 @@ int enableFsverity(JNIEnv *env, jobject /* clazz */, jstring filePath, jbyteArra
int statxForFsverity(JNIEnv *env, jobject /* clazz */, jstring filePath) { int statxForFsverity(JNIEnv *env, jobject /* clazz */, jstring filePath) {
ScopedUtfChars path(env, filePath); ScopedUtfChars path(env, filePath);
// Call statx and check STATX_ATTR_VERITY. // There are two ways to check whether a file has fs-verity enabled: statx() and FS_IOC_GETFLAGS
// (See https://www.kernel.org/doc/html/latest/filesystems/fsverity.html#statx and
// https://www.kernel.org/doc/html/latest/filesystems/fsverity.html#fs-ioc-getflags.)
// We try statx() first, since it doesn't require opening the file.
struct statx out = {}; struct statx out = {};
if (statx(AT_FDCWD, path.c_str(), 0 /* flags */, STATX_ALL, &out) != 0) { if (statx(AT_FDCWD, path.c_str(), 0 /* flags */, STATX_ALL, &out) != 0) {
return -errno; return -errno;
@@ -89,8 +93,12 @@ int statxForFsverity(JNIEnv *env, jobject /* clazz */, jstring filePath) {
return (out.stx_attributes & STATX_ATTR_VERITY) != 0; return (out.stx_attributes & STATX_ATTR_VERITY) != 0;
} }
// STATX_ATTR_VERITY is not supported for the file path. // The filesystem doesn't support STATX_ATTR_VERITY. This normally means that it doesn't
// In this case, call ioctl(FS_IOC_GETFLAGS) and check FS_VERITY_FL. // support fs-verity, in which case we should simply return 0. Unfortunately, virtio-fs is an
// exception, since it doesn't support STATX_ATTR_VERITY but does support querying FS_VERITY_FL
// via FS_IOC_GETFLAGS. So we have to fall back to FS_IOC_GETFLAGS. Note: despite being an
// ioctl, FS_IOC_GETFLAGS doesn't require the "ioctl" SELinux permission but rather "getattr".
::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) {
ALOGE("open failed at %s", path.c_str()); ALOGE("open failed at %s", path.c_str());
@@ -99,6 +107,11 @@ int statxForFsverity(JNIEnv *env, jobject /* clazz */, jstring filePath) {
unsigned int flags; unsigned int flags;
if (ioctl(rfd.get(), FS_IOC_GETFLAGS, &flags) < 0) { if (ioctl(rfd.get(), FS_IOC_GETFLAGS, &flags) < 0) {
if (errno == ENOTTY) {
// If the filesystem supports neither STATX_ATTR_VERITY nor FS_IOC_GETFLAGS, then assume
// that it doesn't support fs-verity.
return 0;
}
ALOGE("ioctl(FS_IOC_GETFLAGS) failed at %s", path.c_str()); ALOGE("ioctl(FS_IOC_GETFLAGS) failed at %s", path.c_str());
return -errno; return -errno;
} }