commit c01c4564320dd3cd5e42bbf93a35c4081b232ca3
author Josh Gao <jmgao@google.com> Sat Jan 21 01:13:35 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Jan 21 01:13:35 2017 +0000
tree ece4044faf7762694367ca5fa4e9976b6f1c5dfc
parent 2b12e660da969fed27a9060b1d190b7630d2f886
parent 77730e478c1659702a9161d4a0952d7af940d3a7

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

Change-Id: Ifa14af07b422a764fcf9204343090540eea51089

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) {