Merge changes I5fd4b49c,Ibf7e5259
* changes:
Mark open() as deliberately not O_CLOEXEC.
odsign: Don't initialize if we can't find a Keymaster.
diff --git a/ondevice-signing/Keymaster.cpp b/ondevice-signing/Keymaster.cpp
index d43828a..267dec8 100644
--- a/ondevice-signing/Keymaster.cpp
+++ b/ondevice-signing/Keymaster.cpp
@@ -68,7 +68,7 @@
mDevice = devToUse;
- return true;
+ return mDevice != nullptr;
}
std::optional<Keymaster> Keymaster::getInstance() {
diff --git a/ondevice-signing/odsign_main.cpp b/ondevice-signing/odsign_main.cpp
index b019bb9..3baba68 100644
--- a/ondevice-signing/odsign_main.cpp
+++ b/ondevice-signing/odsign_main.cpp
@@ -50,6 +50,7 @@
Result<void> addCertToFsVerityKeyring(const std::string& path) {
const char* const argv[] = {kFsVerityInitPath, "--load-extra-key", "fsv_ods"};
+ // NOLINTNEXTLINE(android-cloexec-open): Deliberately not O_CLOEXEC
int fd = open(path.c_str(), O_RDONLY);
pid_t pid = fork();
if (pid == 0) {