commit fbf14e67e96dd47e7066e4f36f5552bc5a2fd0a0
author Treehugger Robot <treehugger-gerrit@google.com> Fri Feb 04 13:27:33 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 04 13:27:33 2022 +0000
tree 473e975a82963e0c6ec29d3acfaaece62732a2e6
parent 8099450d9edd92f4516a7a9faefe8aaaa7cf123f
parent a18130b844da2140b0032f63c0a1811514487a9a

Merge "Don't check for /dev/kvm"

ondevice-signing/odsign_main.cpp

diff --git a/ondevice-signing/odsign_main.cpp b/ondevice-signing/odsign_main.cpp
index a324857..5c541ae 100644
--- a/ondevice-signing/odsign_main.cpp
+++ b/ondevice-signing/odsign_main.cpp
@@ -53,7 +53,6 @@
 constexpr const char* kOdrefreshPath = "/apex/com.android.art/bin/odrefresh";
 constexpr const char* kCompOsVerifyPath = "/apex/com.android.compos/bin/compos_verify_key";
 constexpr const char* kFsVerityProcPath = "/proc/sys/fs/verity";
-constexpr const char* kKvmDevicePath = "/dev/kvm";
 
 constexpr bool kForceCompilation = false;
 constexpr bool kUseCompOs = true;
@@ -145,7 +144,8 @@
 }
 
 bool compOsPresent() {
-    return access(kCompOsVerifyPath, X_OK) == 0 && access(kKvmDevicePath, F_OK) == 0;
+    // We must have the CompOS APEX
+    return access(kCompOsVerifyPath, X_OK) == 0;
 }
 
 Result<void> verifyExistingRootCert(const SigningKey& key) {