6ac5d7dc56
Document the differences between adb_*() and unix_*() in the function prototypes in sysdeps.h. See the file for the details (CR/LF translation, well-known file descriptors, etc.). Fix adb_read(), adb_write(), and adb_close() calls that should really be unix_read(), unix_write(), and unix_close(). Note that this should have no impact on unix because on unix, unix_read/unix_write/unix_close are macros that map to adb_read/adb_write/adb_close. Improve sysdeps_win32.cpp file descriptor diagnostic logging to output the name of the function that was passed a bad file descriptor. Change-Id: I0a1d9c28772656c80bcc303ef8b61fccf4cd637c Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
122 lines
3.6 KiB
C++
122 lines
3.6 KiB
C++
/*
|
|
* 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.
|
|
*/
|
|
|
|
#define TRACE_TAG TRACE_ADB
|
|
|
|
#include "sysdeps.h"
|
|
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <mntent.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <sys/mount.h>
|
|
#include <unistd.h>
|
|
|
|
#include <string>
|
|
|
|
#include "adb.h"
|
|
#include "adb_io.h"
|
|
#include "adb_utils.h"
|
|
#include "cutils/properties.h"
|
|
|
|
// Returns the device used to mount a directory in /proc/mounts.
|
|
static std::string find_mount(const char* dir) {
|
|
std::unique_ptr<FILE, int(*)(FILE*)> fp(setmntent("/proc/mounts", "r"), endmntent);
|
|
if (!fp) {
|
|
return "";
|
|
}
|
|
|
|
mntent* e;
|
|
while ((e = getmntent(fp.get())) != nullptr) {
|
|
if (strcmp(dir, e->mnt_dir) == 0) {
|
|
return e->mnt_fsname;
|
|
}
|
|
}
|
|
return "";
|
|
}
|
|
|
|
bool make_block_device_writable(const std::string& dev) {
|
|
int fd = unix_open(dev.c_str(), O_RDONLY | O_CLOEXEC);
|
|
if (fd == -1) {
|
|
return false;
|
|
}
|
|
|
|
int OFF = 0;
|
|
bool result = (ioctl(fd, BLKROSET, &OFF) != -1);
|
|
unix_close(fd);
|
|
return result;
|
|
}
|
|
|
|
static bool remount_partition(int fd, const char* dir) {
|
|
if (!directory_exists(dir)) {
|
|
return true;
|
|
}
|
|
std::string dev = find_mount(dir);
|
|
if (dev.empty()) {
|
|
return true;
|
|
}
|
|
if (!make_block_device_writable(dev)) {
|
|
WriteFdFmt(fd, "remount of %s failed; couldn't make block device %s writable: %s\n",
|
|
dir, dev.c_str(), strerror(errno));
|
|
return false;
|
|
}
|
|
if (mount(dev.c_str(), dir, "none", MS_REMOUNT, nullptr) == -1) {
|
|
WriteFdFmt(fd, "remount of %s failed: %s\n", dir, strerror(errno));
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
void remount_service(int fd, void* cookie) {
|
|
if (getuid() != 0) {
|
|
WriteFdExactly(fd, "Not running as root. Try \"adb root\" first.\n");
|
|
adb_close(fd);
|
|
return;
|
|
}
|
|
|
|
char prop_buf[PROPERTY_VALUE_MAX];
|
|
property_get("partition.system.verified", prop_buf, "");
|
|
bool system_verified = (strlen(prop_buf) > 0);
|
|
|
|
property_get("partition.vendor.verified", prop_buf, "");
|
|
bool vendor_verified = (strlen(prop_buf) > 0);
|
|
|
|
if (system_verified || vendor_verified) {
|
|
// Allow remount but warn of likely bad effects
|
|
bool both = system_verified && vendor_verified;
|
|
WriteFdFmt(fd,
|
|
"dm_verity is enabled on the %s%s%s partition%s.\n",
|
|
system_verified ? "system" : "",
|
|
both ? " and " : "",
|
|
vendor_verified ? "vendor" : "",
|
|
both ? "s" : "");
|
|
WriteFdExactly(fd,
|
|
"Use \"adb disable-verity\" to disable verity.\n"
|
|
"If you do not, remount may succeed, however, you will still "
|
|
"not be able to write to these volumes.\n");
|
|
}
|
|
|
|
bool success = true;
|
|
success &= remount_partition(fd, "/system");
|
|
success &= remount_partition(fd, "/vendor");
|
|
success &= remount_partition(fd, "/oem");
|
|
|
|
WriteFdExactly(fd, success ? "remount succeeded\n" : "remount failed\n");
|
|
|
|
adb_close(fd);
|
|
}
|