-// Copyright 2018 The Chromium Authors. All rights reserved.
+// Copyright 2018 The Chromium Authors
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "base/native_library.h"
#include <fcntl.h>
+#include <fuchsia/io/cpp/fidl.h>
+#include <lib/fdio/directory.h>
#include <lib/fdio/io.h>
#include <lib/zx/vmo.h>
#include <stdio.h>
#include <zircon/status.h>
#include <zircon/syscalls.h>
-#include "base/base_paths_fuchsia.h"
+#include "base/base_paths.h"
#include "base/files/file.h"
#include "base/files/file_path.h"
#include "base/fuchsia/fuchsia_logging.h"
-#include "base/logging.h"
+#include "base/notreached.h"
#include "base/path_service.h"
#include "base/posix/safe_strerror.h"
+#include "base/strings/strcat.h"
+#include "base/strings/string_piece.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "base/threading/thread_restrictions.h"
+#include "base_paths.h"
namespace base {
NativeLibrary LoadNativeLibraryWithOptions(const FilePath& library_path,
const NativeLibraryOptions& options,
NativeLibraryLoadError* error) {
- std::vector<base::FilePath::StringType> components;
- library_path.GetComponents(&components);
- if (components.size() != 1u) {
- NOTREACHED() << "library_path is a path, should be a filename: "
- << library_path.MaybeAsASCII();
- return nullptr;
- }
-
FilePath computed_path;
- base::PathService::Get(DIR_SOURCE_ROOT, &computed_path);
- computed_path = computed_path.AppendASCII("lib").Append(components[0]);
- base::File library(computed_path,
- base::File::FLAG_OPEN | base::File::FLAG_READ);
- if (!library.IsValid()) {
- if (error) {
- error->message = base::StringPrintf(
- "open library: %s",
- base::File::ErrorToString(library.error_details()).c_str());
+ FilePath library_root_path =
+ base::PathService::CheckedGet(DIR_ASSETS).Append("lib");
+ if (library_path.IsAbsolute()) {
+ // See more info in fxbug.dev/105910.
+ if (!library_root_path.IsParent(library_path)) {
+ auto error_message =
+ base::StringPrintf("Absolute library paths must begin with %s",
+ library_root_path.value().c_str());
+ DLOG(ERROR) << error_message;
+ if (error) {
+ error->message = std::move(error_message);
+ }
+ return nullptr;
}
- return nullptr;
+ computed_path = library_path;
+ } else {
+ computed_path = library_root_path.Append(library_path);
}
- zx::vmo vmo;
- zx_status_t status = fdio_get_vmo_clone(library.GetPlatformFile(),
- vmo.reset_and_get_address());
+ // Use fdio_open_fd (a Fuchsia-specific API) here so we can pass the
+ // appropriate FS rights flags to request executability.
+ // TODO(crbug.com/1018538): Teach base::File about FLAG_WIN_EXECUTE on
+ // Fuchsia, and then use it here instead of using fdio_open_fd() directly.
+ base::ScopedFD fd;
+ zx_status_t status = fdio_open_fd(
+ computed_path.value().c_str(),
+ static_cast<uint32_t>(fuchsia::io::OpenFlags::RIGHT_READABLE |
+ fuchsia::io::OpenFlags::RIGHT_EXECUTABLE),
+ base::ScopedFD::Receiver(fd).get());
if (status != ZX_OK) {
if (error) {
- error->message = base::StringPrintf("fdio_get_vmo_clone: %s",
- zx_status_get_string(status));
+ error->message =
+ base::StringPrintf("fdio_open_fd: %s", zx_status_get_string(status));
}
return nullptr;
}
- // VMOs must be marked as exec-capable to be mapped executable in dlopen_vmo,
- // and fdio_get_vmo_clone shouldn't be marking every VMO it returns
- // exec-capable. So we should mark it as exec-capable here.
- // In the fullness of time, this invalid handle should be swapped out for a
- // ZX_RSRC_KIND_VMEX handle.
- status = vmo.replace_as_executable(zx::handle(), &vmo);
+ zx::vmo vmo;
+ status = fdio_get_vmo_exec(fd.get(), vmo.reset_and_get_address());
if (status != ZX_OK) {
if (error) {
- error->message = base::StringPrintf("zx_vmo_replace_as_executable: %s",
+ error->message = base::StringPrintf("fdio_get_vmo_exec: %s",
zx_status_get_string(status));
}
return nullptr;
}
void* GetFunctionPointerFromNativeLibrary(NativeLibrary library,
- StringPiece name) {
- return dlsym(library, name.data());
+ const char* name) {
+ return dlsym(library, name);
}
std::string GetNativeLibraryName(StringPiece name) {
- return base::StringPrintf("lib%s.so", name.as_string().c_str());
+ return StrCat({"lib", name, ".so"});
}
std::string GetLoadableModuleName(StringPiece name) {