commit bafab588906611975b5c359665cb503c005fd423
author Josh Gao <jmgao@google.com> Sat Jan 21 01:22:24 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Jan 21 01:22:24 2017 +0000
tree 776f816dcc64aa7aa24ef3c77d144d2e16afd6e8
parent 74d84d5ebe89bbad4f6bd1fa953e908bdc69d267
parent f44eb0f713e7b25ead55a7ddad09bc82d71d654e

Merge "adb: check for and report inotify_init1 failure." am: 41ee55a875 am: 95a3a2fc3d am: 22ce93df4a
am: b1d8b8811a

Change-Id: I6564aba9086bf98ced4251d4d3aac0824f232dad

adb/adb_auth_host.cpp

diff --git a/adb/adb_auth_host.cpp b/adb/adb_auth_host.cpp
index ec9b1c3..c3f1fe0 100644
--- a/adb/adb_auth_host.cpp
+++ b/adb/adb_auth_host.cpp
@@ -388,7 +388,13 @@
 
 static void adb_auth_inotify_init(const std::set<std::string>& paths) {
     LOG(INFO) << "adb_auth_inotify_init...";
+
     int infd = inotify_init1(IN_CLOEXEC | IN_NONBLOCK);
+    if (infd < 0) {
+        PLOG(ERROR) << "failed to create inotify fd";
+        return;
+    }
+
     for (const std::string& path : paths) {
         int wd = inotify_add_watch(infd, path.c_str(), IN_CREATE | IN_MOVED_TO);
         if (wd < 0) {