commit 54f3e37eddb36642aab0b52405c1ae2a31f87aa2
author Victor Hsieh <victorhsieh@google.com> Mon Mar 18 17:48:15 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Mar 18 17:48:15 2019 -0700
tree bec6bd81a0b2777dc9cf7096c8d3a341a5270fbf
parent 1dd49e2de4ce6213d6127ced68771b504d6ac313
parent 8aa059438d440eeea30a7a92e8a79813135fe627

Merge "mini-keyctl: use ParseInt to parse keys"
am: 8aa059438d

Change-Id: I3e2ce4749129943ea8dc9e0eaa74721e57f52c03

libkeyutils/mini_keyctl.cpp

diff --git a/libkeyutils/mini_keyctl.cpp b/libkeyutils/mini_keyctl.cpp
index 844f873..e09c864 100644
--- a/libkeyutils/mini_keyctl.cpp
+++ b/libkeyutils/mini_keyctl.cpp
@@ -20,6 +20,7 @@
 
 #include "mini_keyctl_utils.h"
 
+#include <error.h>
 #include <stdio.h>
 #include <unistd.h>
 
@@ -36,6 +37,14 @@
   _exit(exit_code);
 }
 
+static key_serial_t parseKeyOrDie(const char* str) {
+  key_serial_t key;
+  if (!android::base::ParseInt(str, &key)) {
+    error(1 /* exit code */, 0 /* errno */, "Unparsable key: '%s'\n", str);
+  }
+  return key;
+}
+
 int main(int argc, const char** argv) {
   if (argc < 2) Usage(1);
   const std::string action = argv[1];
@@ -67,17 +76,13 @@
     return RestrictKeyring(keyring);
   } else if (action == "unlink") {
     if (argc != 4) Usage(1);
-    key_serial_t key = std::stoi(argv[2], nullptr, 16);
+    key_serial_t key = parseKeyOrDie(argv[2]);
     const std::string keyring = argv[3];
     return Unlink(key, keyring);
   } else if (action == "security") {
     if (argc != 3) Usage(1);
     const char* key_str = argv[2];
-    key_serial_t key;
-    if (!android::base::ParseInt(key_str, &key)) {
-      fprintf(stderr, "Unparsable key: '%s'\n", key_str);
-      return 1;
-    }
+    key_serial_t key = parseKeyOrDie(key_str);
     std::string context = RetrieveSecurityContext(key);
     if (context.empty()) {
       perror(key_str);

libkeyutils/mini_keyctl_utils.cpp

diff --git a/libkeyutils/mini_keyctl_utils.cpp b/libkeyutils/mini_keyctl_utils.cpp
index 1c80ffb..9fe2dfe 100644
--- a/libkeyutils/mini_keyctl_utils.cpp
+++ b/libkeyutils/mini_keyctl_utils.cpp
@@ -30,6 +30,7 @@
 
 #include <android-base/file.h>
 #include <android-base/logging.h>
+#include <android-base/parseint.h>
 #include <android-base/properties.h>
 #include <android-base/strings.h>
 #include <keyutils.h>
@@ -53,12 +54,8 @@
   }
 
   // If the keyring id is already a hex number, directly convert it to keyring id
-  try {
-    key_serial_t id = std::stoi(keyring_desc, nullptr, 16);
-    *keyring_id = id;
+  if (android::base::ParseInt(keyring_desc.c_str(), keyring_id)) {
     return true;
-  } catch (const std::exception& e) {
-    LOG(INFO) << "search /proc/keys for keyring id";
   }
 
   // Only keys allowed by SELinux rules will be shown here.