commit a7e10c8e08f3e5943fc16cc271c18795fb88c4fd
author George Kulakowski <kulakowski@google.com> Mon Jan 28 23:52:02 2019 -0800
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Tue Jan 29 08:11:18 2019 +0000
tree a3664b9ad77f5420842ca1cbd003f8c4f022163a
parent f52b0dfb82bf3c3be712d29cbbb77ff4fc49ab4e

[devmgr] Clean up a small TODO in fshost.h

Test: booted with qemu arm under asan
Change-Id: Ia758a685c1ad031e090e8d2e16294ff06ef765a8

system/core/devmgr/fshost/fshost.h

diff --git a/system/core/devmgr/fshost/fshost.h b/system/core/devmgr/fshost/fshost.h
index 0cd64ae..be6d43d 100644
--- a/system/core/devmgr/fshost/fshost.h
+++ b/system/core/devmgr/fshost/fshost.h
@@ -29,9 +29,7 @@
                       zx::event event);
 
     // Synchronously opens a connection on the requested path.
-    //
-    // TODO: Return an error code, instead of "invalid handle", on error.
-    zx::channel Open(const char* path) const;
+    zx_status_t Open(const char* path, zx::channel* out_connection) const;
 
     // Create and install the namespace for the current process, using
     // the owned channels as connections.

system/core/devmgr/fshost/main.cpp

diff --git a/system/core/devmgr/fshost/main.cpp b/system/core/devmgr/fshost/main.cpp
index 64d05b6..68d5ac1 100644
--- a/system/core/devmgr/fshost/main.cpp
+++ b/system/core/devmgr/fshost/main.cpp
@@ -269,21 +269,22 @@
     : devfs_root_(std::move(devfs_root)), svc_root_(std::move(svc_root)),
       fs_root_(std::move(fs_root)), event_(std::move(event)) {}
 
-zx::channel FshostConnections::Open(const char* path) const {
+zx_status_t FshostConnections::Open(const char* path, zx::channel* out_connection) const {
+    zx::channel connection;
+    zx_status_t status = ZX_OK;
     if (!strcmp(path, "svc")) {
-        return zx::channel(fdio_service_clone(svc_root_.get()));
+        connection.reset(fdio_service_clone(svc_root_.get()));
+    } else if (!strcmp(path, "dev")) {
+        connection.reset(fdio_service_clone(devfs_root_.get()));
+    } else {
+        zx::channel server;
+        status = zx::channel::create(0, &connection, &server);
+        if (status == ZX_OK) {
+            status = fdio_open_at(fs_root_.get(), path, kFsDirFlags, server.release());
+        }
     }
-    if (!strcmp(path, "dev")) {
-        return zx::channel(fdio_service_clone(devfs_root_.get()));
-    }
-    zx::channel client, server;
-    if (zx::channel::create(0, &client, &server) != ZX_OK) {
-        return zx::channel();
-    }
-    if (fdio_open_at(fs_root_.get(), path, kFsDirFlags, server.release()) != ZX_OK) {
-        return zx::channel();
-    }
-    return client;
+    *out_connection = std::move(connection);
+    return status;
 }
 
 zx_status_t FshostConnections::CreateNamespace() {
@@ -298,7 +299,12 @@
         printf("fshost: cannot bind /fs to namespace: %d\n", status);
         return status;
     }
-    if ((status = fdio_ns_bind(ns, "/system", Open("system").release())) != ZX_OK) {
+    zx::channel system_connection;
+    if ((status = Open("system", &system_connection)) != ZX_OK) {
+        printf("devmgr: cannot open connection to /system: %d\n", status);
+        return status;
+    }
+    if ((status = fdio_ns_bind(ns, "/system", system_connection.release())) != ZX_OK) {
         printf("devmgr: cannot bind /system to namespace: %d\n", status);
         return status;
     }
@@ -306,7 +312,12 @@
 }
 
 zx::channel fs_clone(const char* path) {
-    return g_fshost->GetConnections().Open(path);
+    zx::channel connection;
+    if (g_fshost->GetConnections().Open(path, &connection) == ZX_OK) {
+        return connection;
+    } else {
+        return zx::channel();
+    }
 }
 
 } // namespace devmgr