2009-03-04 04:32:55 +01:00
|
|
|
/*
|
|
|
|
* Copyright (C) 2008 The Android Open Source Project
|
|
|
|
*
|
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
* you may not use this file except in compliance with the License.
|
|
|
|
* You may obtain a copy of the License at
|
|
|
|
*
|
|
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
*
|
|
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
* See the License for the specific language governing permissions and
|
|
|
|
* limitations under the License.
|
|
|
|
*/
|
|
|
|
|
2017-04-07 01:30:22 +02:00
|
|
|
#include "util.h"
|
|
|
|
|
2016-10-27 16:45:34 +02:00
|
|
|
#include <ctype.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <fcntl.h>
|
|
|
|
#include <pwd.h>
|
2009-03-04 04:32:55 +01:00
|
|
|
#include <stdarg.h>
|
|
|
|
#include <stdio.h>
|
2017-04-07 01:30:22 +02:00
|
|
|
#include <stdlib.h>
|
2009-03-04 04:32:55 +01:00
|
|
|
#include <string.h>
|
2016-10-27 16:45:34 +02:00
|
|
|
#include <sys/socket.h>
|
2009-03-04 04:32:55 +01:00
|
|
|
#include <sys/un.h>
|
2017-04-07 01:30:22 +02:00
|
|
|
#include <time.h>
|
|
|
|
#include <unistd.h>
|
2009-03-04 04:32:55 +01:00
|
|
|
|
2016-11-15 02:08:47 +01:00
|
|
|
#include <thread>
|
|
|
|
|
2015-12-05 07:00:26 +01:00
|
|
|
#include <android-base/file.h>
|
2016-06-25 00:12:21 +02:00
|
|
|
#include <android-base/logging.h>
|
2016-10-27 16:45:34 +02:00
|
|
|
#include <android-base/stringprintf.h>
|
2015-12-05 07:00:26 +01:00
|
|
|
#include <android-base/strings.h>
|
2016-11-07 19:16:53 +01:00
|
|
|
#include <android-base/unique_fd.h>
|
2016-11-29 20:20:58 +01:00
|
|
|
#include <cutils/android_reboot.h>
|
2009-03-04 04:32:55 +01:00
|
|
|
#include <cutils/sockets.h>
|
2017-04-07 01:30:22 +02:00
|
|
|
#include <selinux/android.h>
|
2009-03-04 04:32:55 +01:00
|
|
|
|
2017-03-13 19:54:47 +01:00
|
|
|
#include "reboot.h"
|
2018-02-14 01:50:08 +01:00
|
|
|
|
|
|
|
#if defined(__ANDROID__)
|
|
|
|
#include <android-base/properties.h>
|
|
|
|
|
2017-08-10 21:22:44 +02:00
|
|
|
#include "selinux.h"
|
2018-02-14 01:50:08 +01:00
|
|
|
#else
|
|
|
|
#include "host_init_stubs.h"
|
|
|
|
#endif
|
2009-03-04 04:32:55 +01:00
|
|
|
|
2017-05-02 02:10:09 +02:00
|
|
|
#ifdef _INIT_INIT_H
|
|
|
|
#error "Do not include init.h in files used by ueventd or watchdogd; it will expose init's globals"
|
|
|
|
#endif
|
|
|
|
|
2017-03-24 19:43:02 +01:00
|
|
|
using android::base::boot_clock;
|
2017-05-05 02:40:33 +02:00
|
|
|
using namespace std::literals::string_literals;
|
2017-03-24 19:43:02 +01:00
|
|
|
|
2017-06-22 21:53:17 +02:00
|
|
|
namespace android {
|
|
|
|
namespace init {
|
|
|
|
|
Allow the use of a custom Android DT directory
On platforms that use ACPI instead of Device Tree (DT), such as
Ranchu x86/x86_64, /proc/device-tree/firmware/android/ does not
exist. As a result, Android O is unable to mount /system, etc.
at the first stage of init:
init: First stage mount skipped (missing/incompatible fstab in
device tree)
Those platforms may create another directory that mimics the layout
of the standard DT directory in procfs, and store early mount
configuration there. E.g., Ranchu x86/x86_64 creates one in sysfs
using information encoded in the ACPI tables:
https://android-review.googlesource.com/442472
https://android-review.googlesource.com/443432
https://android-review.googlesource.com/442393
https://android-review.googlesource.com/442395
Therefore, instead of hardcoding the Android DT path, load it from
the kernel command line using a new Android-specific property key
("androidboot.android_dt_dir"). If no such property exists, fall
back to the standard procfs path (so no change is needed for DT-
aware platforms).
Note that init/ and fs_mgr/ each have their own copy of the Android
DT path, because they do not share any global state. A future CL
should remove the duplication by refactoring.
With this CL as well as the above ones, the said warning is gone,
but early mount fails. That is a separate bug, though, and will be
addressed by another CL.
Test: Boot patched sdk_phone_x86-userdebug system image with patched
Goldfish 3.18 x86 kernel in patched Android Emulator, verify
the "init: First stage mount skipped" warning no longer shows
in dmesg.
Change-Id: Ib6df577319503ec1ca778de2b5458cc72ce07415
Signed-off-by: Yu Ning <yu.ning@intel.com>
2017-07-26 11:54:08 +02:00
|
|
|
const std::string kDefaultAndroidDtDir("/proc/device-tree/firmware/android/");
|
|
|
|
|
2017-05-05 02:40:33 +02:00
|
|
|
// DecodeUid() - decodes and returns the given string, which can be either the
|
2017-08-03 21:54:07 +02:00
|
|
|
// numeric or name representation, into the integer uid or gid.
|
|
|
|
Result<uid_t> DecodeUid(const std::string& name) {
|
2017-05-05 02:40:33 +02:00
|
|
|
if (isalpha(name[0])) {
|
|
|
|
passwd* pwd = getpwnam(name.c_str());
|
2017-08-03 21:54:07 +02:00
|
|
|
if (!pwd) return ErrnoError() << "getpwnam failed";
|
|
|
|
|
|
|
|
return pwd->pw_uid;
|
2016-04-07 04:18:50 +02:00
|
|
|
}
|
2009-03-04 04:32:55 +01:00
|
|
|
|
|
|
|
errno = 0;
|
2017-05-05 02:40:33 +02:00
|
|
|
uid_t result = static_cast<uid_t>(strtoul(name.c_str(), 0, 0));
|
2017-08-03 21:54:07 +02:00
|
|
|
if (errno) return ErrnoError() << "strtoul failed";
|
|
|
|
|
|
|
|
return result;
|
2009-03-04 04:32:55 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2017-05-05 23:44:35 +02:00
|
|
|
* CreateSocket - creates a Unix domain socket in ANDROID_SOCKET_DIR
|
2009-03-04 04:32:55 +01:00
|
|
|
* ("/dev/socket") as dictated in init.rc. This socket is inherited by the
|
|
|
|
* daemon. We communicate the file descriptor's value via the environment
|
|
|
|
* variable ANDROID_SOCKET_ENV_PREFIX<name> ("ANDROID_SOCKET_foo").
|
|
|
|
*/
|
2017-05-05 23:44:35 +02:00
|
|
|
int CreateSocket(const char* name, int type, bool passcred, mode_t perm, uid_t uid, gid_t gid,
|
2017-08-10 21:22:44 +02:00
|
|
|
const char* socketcon) {
|
2015-11-24 01:26:42 +01:00
|
|
|
if (socketcon) {
|
|
|
|
if (setsockcreatecon(socketcon) == -1) {
|
2016-06-25 00:12:21 +02:00
|
|
|
PLOG(ERROR) << "setsockcreatecon(\"" << socketcon << "\") failed";
|
2015-11-24 01:26:42 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
2009-03-04 04:32:55 +01:00
|
|
|
|
2016-11-07 19:16:53 +01:00
|
|
|
android::base::unique_fd fd(socket(PF_UNIX, type, 0));
|
2009-03-04 04:32:55 +01:00
|
|
|
if (fd < 0) {
|
2016-06-25 00:12:21 +02:00
|
|
|
PLOG(ERROR) << "Failed to open socket '" << name << "'";
|
2009-03-04 04:32:55 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2016-11-07 19:16:53 +01:00
|
|
|
if (socketcon) setsockcreatecon(NULL);
|
2013-05-13 18:37:04 +02:00
|
|
|
|
2016-11-07 19:16:53 +01:00
|
|
|
struct sockaddr_un addr;
|
2009-03-04 04:32:55 +01:00
|
|
|
memset(&addr, 0 , sizeof(addr));
|
|
|
|
addr.sun_family = AF_UNIX;
|
|
|
|
snprintf(addr.sun_path, sizeof(addr.sun_path), ANDROID_SOCKET_DIR"/%s",
|
|
|
|
name);
|
|
|
|
|
2016-11-07 19:16:53 +01:00
|
|
|
if ((unlink(addr.sun_path) != 0) && (errno != ENOENT)) {
|
2016-06-25 00:12:21 +02:00
|
|
|
PLOG(ERROR) << "Failed to unlink old socket '" << name << "'";
|
2016-11-07 19:16:53 +01:00
|
|
|
return -1;
|
2009-03-04 04:32:55 +01:00
|
|
|
}
|
|
|
|
|
2017-08-10 21:22:44 +02:00
|
|
|
std::string secontext;
|
|
|
|
if (SelabelLookupFileContext(addr.sun_path, S_IFSOCK, &secontext) && !secontext.empty()) {
|
|
|
|
setfscreatecon(secontext.c_str());
|
2012-01-13 14:48:47 +01:00
|
|
|
}
|
|
|
|
|
2017-05-05 23:44:35 +02:00
|
|
|
if (passcred) {
|
|
|
|
int on = 1;
|
|
|
|
if (setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on))) {
|
|
|
|
PLOG(ERROR) << "Failed to set SO_PASSCRED '" << name << "'";
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-11-07 19:16:53 +01:00
|
|
|
int ret = bind(fd, (struct sockaddr *) &addr, sizeof (addr));
|
|
|
|
int savederrno = errno;
|
2009-03-04 04:32:55 +01:00
|
|
|
|
2017-08-10 21:22:44 +02:00
|
|
|
if (!secontext.empty()) {
|
|
|
|
setfscreatecon(nullptr);
|
|
|
|
}
|
2012-01-13 14:48:47 +01:00
|
|
|
|
2016-02-25 00:50:52 +01:00
|
|
|
if (ret) {
|
2016-11-07 19:16:53 +01:00
|
|
|
errno = savederrno;
|
2016-06-25 00:12:21 +02:00
|
|
|
PLOG(ERROR) << "Failed to bind socket '" << name << "'";
|
2016-02-25 00:50:52 +01:00
|
|
|
goto out_unlink;
|
|
|
|
}
|
|
|
|
|
2016-11-07 19:16:53 +01:00
|
|
|
if (lchown(addr.sun_path, uid, gid)) {
|
2016-06-25 00:12:21 +02:00
|
|
|
PLOG(ERROR) << "Failed to lchown socket '" << addr.sun_path << "'";
|
2016-02-25 00:50:52 +01:00
|
|
|
goto out_unlink;
|
|
|
|
}
|
2016-11-07 19:16:53 +01:00
|
|
|
if (fchmodat(AT_FDCWD, addr.sun_path, perm, AT_SYMLINK_NOFOLLOW)) {
|
2016-06-25 00:12:21 +02:00
|
|
|
PLOG(ERROR) << "Failed to fchmodat socket '" << addr.sun_path << "'";
|
2016-02-25 00:50:52 +01:00
|
|
|
goto out_unlink;
|
|
|
|
}
|
2009-03-04 04:32:55 +01:00
|
|
|
|
2016-06-25 00:12:21 +02:00
|
|
|
LOG(INFO) << "Created socket '" << addr.sun_path << "'"
|
|
|
|
<< ", mode " << std::oct << perm << std::dec
|
|
|
|
<< ", user " << uid
|
|
|
|
<< ", group " << gid;
|
2009-03-04 04:32:55 +01:00
|
|
|
|
2016-11-07 19:16:53 +01:00
|
|
|
return fd.release();
|
2009-03-04 04:32:55 +01:00
|
|
|
|
|
|
|
out_unlink:
|
|
|
|
unlink(addr.sun_path);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2017-08-03 21:54:07 +02:00
|
|
|
Result<std::string> ReadFile(const std::string& path) {
|
2017-04-01 00:47:33 +02:00
|
|
|
android::base::unique_fd fd(
|
|
|
|
TEMP_FAILURE_RETRY(open(path.c_str(), O_RDONLY | O_NOFOLLOW | O_CLOEXEC)));
|
2015-02-06 21:19:48 +01:00
|
|
|
if (fd == -1) {
|
2017-08-03 21:54:07 +02:00
|
|
|
return ErrnoError() << "open() failed";
|
2015-02-06 21:19:48 +01:00
|
|
|
}
|
2009-03-04 04:32:55 +01:00
|
|
|
|
2015-02-06 21:19:48 +01:00
|
|
|
// For security reasons, disallow world-writable
|
|
|
|
// or group-writable files.
|
|
|
|
struct stat sb;
|
|
|
|
if (fstat(fd, &sb) == -1) {
|
2017-08-03 21:54:07 +02:00
|
|
|
return ErrnoError() << "fstat failed()";
|
2012-01-18 19:39:01 +01:00
|
|
|
}
|
|
|
|
if ((sb.st_mode & (S_IWGRP | S_IWOTH)) != 0) {
|
2017-08-03 21:54:07 +02:00
|
|
|
return Error() << "Skipping insecure file";
|
2012-01-18 19:39:01 +01:00
|
|
|
}
|
|
|
|
|
2017-08-03 21:54:07 +02:00
|
|
|
std::string content;
|
|
|
|
if (!android::base::ReadFdToString(fd, &content)) {
|
|
|
|
return ErrnoError() << "Unable to read file contents";
|
2017-05-05 03:17:33 +02:00
|
|
|
}
|
2017-08-03 21:54:07 +02:00
|
|
|
return content;
|
2015-02-06 21:19:48 +01:00
|
|
|
}
|
2009-03-04 04:32:55 +01:00
|
|
|
|
2017-11-27 23:45:26 +01:00
|
|
|
static int OpenFile(const std::string& path, int flags, mode_t mode) {
|
|
|
|
std::string secontext;
|
|
|
|
if (SelabelLookupFileContext(path, mode, &secontext) && !secontext.empty()) {
|
|
|
|
setfscreatecon(secontext.c_str());
|
|
|
|
}
|
|
|
|
|
|
|
|
int rc = open(path.c_str(), flags, mode);
|
|
|
|
|
|
|
|
if (!secontext.empty()) {
|
|
|
|
int save_errno = errno;
|
|
|
|
setfscreatecon(nullptr);
|
|
|
|
errno = save_errno;
|
|
|
|
}
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2017-08-03 21:54:07 +02:00
|
|
|
Result<Success> WriteFile(const std::string& path, const std::string& content) {
|
2016-12-28 09:06:19 +01:00
|
|
|
android::base::unique_fd fd(TEMP_FAILURE_RETRY(
|
2017-11-27 23:45:26 +01:00
|
|
|
OpenFile(path, O_WRONLY | O_CREAT | O_NOFOLLOW | O_TRUNC | O_CLOEXEC, 0600)));
|
2015-02-06 21:19:48 +01:00
|
|
|
if (fd == -1) {
|
2017-08-03 21:54:07 +02:00
|
|
|
return ErrnoError() << "open() failed";
|
2015-04-25 23:10:03 +02:00
|
|
|
}
|
2017-05-05 03:17:33 +02:00
|
|
|
if (!android::base::WriteStringToFd(content, fd)) {
|
2017-08-03 21:54:07 +02:00
|
|
|
return ErrnoError() << "Unable to write file contents";
|
2015-02-06 21:19:48 +01:00
|
|
|
}
|
2017-08-03 21:54:07 +02:00
|
|
|
return Success();
|
2009-03-04 04:32:55 +01:00
|
|
|
}
|
|
|
|
|
2017-08-10 21:22:44 +02:00
|
|
|
bool mkdir_recursive(const std::string& path, mode_t mode) {
|
2017-04-12 23:27:51 +02:00
|
|
|
std::string::size_type slash = 0;
|
|
|
|
while ((slash = path.find('/', slash + 1)) != std::string::npos) {
|
|
|
|
auto directory = path.substr(0, slash);
|
|
|
|
struct stat info;
|
|
|
|
if (stat(directory.c_str(), &info) != 0) {
|
2017-08-10 21:22:44 +02:00
|
|
|
auto ret = make_dir(directory, mode);
|
|
|
|
if (!ret && errno != EEXIST) return false;
|
2010-04-09 01:16:20 +02:00
|
|
|
}
|
|
|
|
}
|
2017-08-10 21:22:44 +02:00
|
|
|
auto ret = make_dir(path, mode);
|
|
|
|
if (!ret && errno != EEXIST) return false;
|
|
|
|
return true;
|
2010-04-09 01:16:20 +02:00
|
|
|
}
|
|
|
|
|
2016-11-11 02:43:47 +01:00
|
|
|
int wait_for_file(const char* filename, std::chrono::nanoseconds timeout) {
|
2017-08-22 21:07:37 +02:00
|
|
|
android::base::Timer t;
|
|
|
|
while (t.duration() < timeout) {
|
2016-11-11 02:43:47 +01:00
|
|
|
struct stat sb;
|
2017-08-22 21:07:37 +02:00
|
|
|
if (stat(filename, &sb) != -1) {
|
|
|
|
LOG(INFO) << "wait for '" << filename << "' took " << t;
|
|
|
|
return 0;
|
|
|
|
}
|
2016-11-15 02:08:47 +01:00
|
|
|
std::this_thread::sleep_for(10ms);
|
2016-11-11 02:43:47 +01:00
|
|
|
}
|
2017-08-22 21:07:37 +02:00
|
|
|
LOG(WARNING) << "wait for '" << filename << "' timed out and took " << t;
|
2016-11-11 02:43:47 +01:00
|
|
|
return -1;
|
2010-04-20 02:10:24 +02:00
|
|
|
}
|
2010-04-21 21:04:20 +02:00
|
|
|
|
2015-05-07 04:19:24 +02:00
|
|
|
void import_kernel_cmdline(bool in_qemu,
|
2016-07-28 01:25:51 +02:00
|
|
|
const std::function<void(const std::string&, const std::string&, bool)>& fn) {
|
2015-05-07 04:19:24 +02:00
|
|
|
std::string cmdline;
|
|
|
|
android::base::ReadFileToString("/proc/cmdline", &cmdline);
|
2011-09-28 18:55:31 +02:00
|
|
|
|
2015-05-07 04:19:24 +02:00
|
|
|
for (const auto& entry : android::base::Split(android::base::Trim(cmdline), " ")) {
|
|
|
|
std::vector<std::string> pieces = android::base::Split(entry, "=");
|
|
|
|
if (pieces.size() == 2) {
|
|
|
|
fn(pieces[0], pieces[1], in_qemu);
|
|
|
|
}
|
2011-09-28 18:55:31 +02:00
|
|
|
}
|
|
|
|
}
|
2012-06-11 19:37:39 +02:00
|
|
|
|
2017-08-10 21:22:44 +02:00
|
|
|
bool make_dir(const std::string& path, mode_t mode) {
|
|
|
|
std::string secontext;
|
|
|
|
if (SelabelLookupFileContext(path, mode, &secontext) && !secontext.empty()) {
|
|
|
|
setfscreatecon(secontext.c_str());
|
2012-06-11 19:37:39 +02:00
|
|
|
}
|
|
|
|
|
2017-08-10 21:22:44 +02:00
|
|
|
int rc = mkdir(path.c_str(), mode);
|
2012-06-11 19:37:39 +02:00
|
|
|
|
2017-08-10 21:22:44 +02:00
|
|
|
if (!secontext.empty()) {
|
2012-06-11 19:37:39 +02:00
|
|
|
int save_errno = errno;
|
2017-08-10 21:22:44 +02:00
|
|
|
setfscreatecon(nullptr);
|
2012-06-11 19:37:39 +02:00
|
|
|
errno = save_errno;
|
|
|
|
}
|
2012-10-17 08:07:05 +02:00
|
|
|
|
2017-08-10 21:22:44 +02:00
|
|
|
return rc == 0;
|
2012-06-11 19:37:39 +02:00
|
|
|
}
|
|
|
|
|
2015-05-08 17:30:33 +02:00
|
|
|
/*
|
|
|
|
* Writes hex_len hex characters (1/2 byte) to hex from bytes.
|
|
|
|
*/
|
|
|
|
std::string bytes_to_hex(const uint8_t* bytes, size_t bytes_len) {
|
|
|
|
std::string hex("0x");
|
|
|
|
for (size_t i = 0; i < bytes_len; i++)
|
|
|
|
android::base::StringAppendF(&hex, "%02x", bytes[i]);
|
|
|
|
return hex;
|
|
|
|
}
|
2015-07-25 01:57:14 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Returns true is pathname is a directory
|
|
|
|
*/
|
|
|
|
bool is_dir(const char* pathname) {
|
|
|
|
struct stat info;
|
|
|
|
if (stat(pathname, &info) == -1) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
return S_ISDIR(info.st_mode);
|
|
|
|
}
|
2015-08-26 20:43:36 +02:00
|
|
|
|
|
|
|
bool expand_props(const std::string& src, std::string* dst) {
|
|
|
|
const char* src_ptr = src.c_str();
|
|
|
|
|
|
|
|
if (!dst) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* - variables can either be $x.y or ${x.y}, in case they are only part
|
|
|
|
* of the string.
|
|
|
|
* - will accept $$ as a literal $.
|
|
|
|
* - no nested property expansion, i.e. ${foo.${bar}} is not supported,
|
|
|
|
* bad things will happen
|
2016-06-07 17:49:01 +02:00
|
|
|
* - ${x.y:-default} will return default value if property empty.
|
2015-08-26 20:43:36 +02:00
|
|
|
*/
|
|
|
|
while (*src_ptr) {
|
|
|
|
const char* c;
|
|
|
|
|
|
|
|
c = strchr(src_ptr, '$');
|
|
|
|
if (!c) {
|
|
|
|
dst->append(src_ptr);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
dst->append(src_ptr, c);
|
|
|
|
c++;
|
|
|
|
|
|
|
|
if (*c == '$') {
|
|
|
|
dst->push_back(*(c++));
|
|
|
|
src_ptr = c;
|
|
|
|
continue;
|
|
|
|
} else if (*c == '\0') {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
std::string prop_name;
|
2016-06-07 17:49:01 +02:00
|
|
|
std::string def_val;
|
2015-08-26 20:43:36 +02:00
|
|
|
if (*c == '{') {
|
|
|
|
c++;
|
|
|
|
const char* end = strchr(c, '}');
|
|
|
|
if (!end) {
|
|
|
|
// failed to find closing brace, abort.
|
2016-06-25 00:12:21 +02:00
|
|
|
LOG(ERROR) << "unexpected end of string in '" << src << "', looking for }";
|
2015-08-26 20:43:36 +02:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
prop_name = std::string(c, end);
|
|
|
|
c = end + 1;
|
2016-06-07 17:49:01 +02:00
|
|
|
size_t def = prop_name.find(":-");
|
|
|
|
if (def < prop_name.size()) {
|
|
|
|
def_val = prop_name.substr(def + 2);
|
|
|
|
prop_name = prop_name.substr(0, def);
|
|
|
|
}
|
2015-08-26 20:43:36 +02:00
|
|
|
} else {
|
|
|
|
prop_name = c;
|
2016-06-25 00:12:21 +02:00
|
|
|
LOG(ERROR) << "using deprecated syntax for specifying property '" << c << "', use ${name} instead";
|
2015-08-26 20:43:36 +02:00
|
|
|
c += prop_name.size();
|
|
|
|
}
|
|
|
|
|
|
|
|
if (prop_name.empty()) {
|
2016-06-25 00:12:21 +02:00
|
|
|
LOG(ERROR) << "invalid zero-length property name in '" << src << "'";
|
2015-08-26 20:43:36 +02:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2017-03-29 01:40:41 +02:00
|
|
|
std::string prop_val = android::base::GetProperty(prop_name, "");
|
2015-08-26 20:43:36 +02:00
|
|
|
if (prop_val.empty()) {
|
2016-06-07 17:49:01 +02:00
|
|
|
if (def_val.empty()) {
|
2016-06-25 00:12:21 +02:00
|
|
|
LOG(ERROR) << "property '" << prop_name << "' doesn't exist while expanding '" << src << "'";
|
2016-06-07 17:49:01 +02:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
prop_val = def_val;
|
2015-08-26 20:43:36 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
dst->append(prop_val);
|
|
|
|
src_ptr = c;
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
2016-11-29 20:20:58 +01:00
|
|
|
|
Allow the use of a custom Android DT directory
On platforms that use ACPI instead of Device Tree (DT), such as
Ranchu x86/x86_64, /proc/device-tree/firmware/android/ does not
exist. As a result, Android O is unable to mount /system, etc.
at the first stage of init:
init: First stage mount skipped (missing/incompatible fstab in
device tree)
Those platforms may create another directory that mimics the layout
of the standard DT directory in procfs, and store early mount
configuration there. E.g., Ranchu x86/x86_64 creates one in sysfs
using information encoded in the ACPI tables:
https://android-review.googlesource.com/442472
https://android-review.googlesource.com/443432
https://android-review.googlesource.com/442393
https://android-review.googlesource.com/442395
Therefore, instead of hardcoding the Android DT path, load it from
the kernel command line using a new Android-specific property key
("androidboot.android_dt_dir"). If no such property exists, fall
back to the standard procfs path (so no change is needed for DT-
aware platforms).
Note that init/ and fs_mgr/ each have their own copy of the Android
DT path, because they do not share any global state. A future CL
should remove the duplication by refactoring.
With this CL as well as the above ones, the said warning is gone,
but early mount fails. That is a separate bug, though, and will be
addressed by another CL.
Test: Boot patched sdk_phone_x86-userdebug system image with patched
Goldfish 3.18 x86 kernel in patched Android Emulator, verify
the "init: First stage mount skipped" warning no longer shows
in dmesg.
Change-Id: Ib6df577319503ec1ca778de2b5458cc72ce07415
Signed-off-by: Yu Ning <yu.ning@intel.com>
2017-07-26 11:54:08 +02:00
|
|
|
static std::string init_android_dt_dir() {
|
|
|
|
// Use the standard procfs-based path by default
|
|
|
|
std::string android_dt_dir = kDefaultAndroidDtDir;
|
|
|
|
// The platform may specify a custom Android DT path in kernel cmdline
|
|
|
|
import_kernel_cmdline(false,
|
|
|
|
[&](const std::string& key, const std::string& value, bool in_qemu) {
|
|
|
|
if (key == "androidboot.android_dt_dir") {
|
|
|
|
android_dt_dir = value;
|
|
|
|
}
|
|
|
|
});
|
|
|
|
LOG(INFO) << "Using Android DT directory " << android_dt_dir;
|
|
|
|
return android_dt_dir;
|
|
|
|
}
|
|
|
|
|
|
|
|
// FIXME: The same logic is duplicated in system/core/fs_mgr/
|
|
|
|
const std::string& get_android_dt_dir() {
|
|
|
|
// Set once and saves time for subsequent calls to this function
|
|
|
|
static const std::string kAndroidDtDir = init_android_dt_dir();
|
|
|
|
return kAndroidDtDir;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Reads the content of device tree file under the platform's Android DT directory.
|
2017-04-17 16:17:09 +02:00
|
|
|
// Returns true if the read is success, false otherwise.
|
|
|
|
bool read_android_dt_file(const std::string& sub_path, std::string* dt_content) {
|
Allow the use of a custom Android DT directory
On platforms that use ACPI instead of Device Tree (DT), such as
Ranchu x86/x86_64, /proc/device-tree/firmware/android/ does not
exist. As a result, Android O is unable to mount /system, etc.
at the first stage of init:
init: First stage mount skipped (missing/incompatible fstab in
device tree)
Those platforms may create another directory that mimics the layout
of the standard DT directory in procfs, and store early mount
configuration there. E.g., Ranchu x86/x86_64 creates one in sysfs
using information encoded in the ACPI tables:
https://android-review.googlesource.com/442472
https://android-review.googlesource.com/443432
https://android-review.googlesource.com/442393
https://android-review.googlesource.com/442395
Therefore, instead of hardcoding the Android DT path, load it from
the kernel command line using a new Android-specific property key
("androidboot.android_dt_dir"). If no such property exists, fall
back to the standard procfs path (so no change is needed for DT-
aware platforms).
Note that init/ and fs_mgr/ each have their own copy of the Android
DT path, because they do not share any global state. A future CL
should remove the duplication by refactoring.
With this CL as well as the above ones, the said warning is gone,
but early mount fails. That is a separate bug, though, and will be
addressed by another CL.
Test: Boot patched sdk_phone_x86-userdebug system image with patched
Goldfish 3.18 x86 kernel in patched Android Emulator, verify
the "init: First stage mount skipped" warning no longer shows
in dmesg.
Change-Id: Ib6df577319503ec1ca778de2b5458cc72ce07415
Signed-off-by: Yu Ning <yu.ning@intel.com>
2017-07-26 11:54:08 +02:00
|
|
|
const std::string file_name = get_android_dt_dir() + sub_path;
|
2017-04-17 16:17:09 +02:00
|
|
|
if (android::base::ReadFileToString(file_name, dt_content)) {
|
|
|
|
if (!dt_content->empty()) {
|
|
|
|
dt_content->pop_back(); // Trims the trailing '\0' out.
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool is_android_dt_value_expected(const std::string& sub_path, const std::string& expected_content) {
|
|
|
|
std::string dt_content;
|
|
|
|
if (read_android_dt_file(sub_path, &dt_content)) {
|
|
|
|
if (dt_content == expected_content) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
2017-06-22 21:53:17 +02:00
|
|
|
|
2018-02-14 01:50:08 +01:00
|
|
|
bool IsLegalPropertyName(const std::string& name) {
|
|
|
|
size_t namelen = name.size();
|
|
|
|
|
|
|
|
if (namelen < 1) return false;
|
|
|
|
if (name[0] == '.') return false;
|
|
|
|
if (name[namelen - 1] == '.') return false;
|
|
|
|
|
|
|
|
/* Only allow alphanumeric, plus '.', '-', '@', ':', or '_' */
|
|
|
|
/* Don't allow ".." to appear in a property name */
|
|
|
|
for (size_t i = 0; i < namelen; i++) {
|
|
|
|
if (name[i] == '.') {
|
|
|
|
// i=0 is guaranteed to never have a dot. See above.
|
|
|
|
if (name[i - 1] == '.') return false;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (name[i] == '_' || name[i] == '-' || name[i] == '@' || name[i] == ':') continue;
|
|
|
|
if (name[i] >= 'a' && name[i] <= 'z') continue;
|
|
|
|
if (name[i] >= 'A' && name[i] <= 'Z') continue;
|
|
|
|
if (name[i] >= '0' && name[i] <= '9') continue;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2017-06-22 21:53:17 +02:00
|
|
|
} // namespace init
|
|
|
|
} // namespace android
|