WeiguangTWK
/
LSPosed
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup unused files

This commit is contained in:
kotori0 2020-11-17 04:21:02 +08:00 committed by solohsu
parent 2461a730a4
commit 697b2b2fdb
6 changed files with 1 additions and 467 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
edxp-common/src/main/java/com/elderdrivers/riru/edxp/framework/Zygote.java
View File

@ -8,13 +8,6 @@ import de.robv.android.xposed.annotation.Level;
@ApiSensitive(Level.LOW)
public class Zygote {
// prevent from fatal error caused by holding not whitelisted file descriptors when forking zygote
// https://github.com/rovo89/Xposed/commit/b3ba245ad04cd485699fb1d2ebde7117e58214ff
public static native void closeFilesBeforeFork();
public static native void reopenFilesAfterFork();
public static void allowFileAcrossFork(String path) {
try {
Class zygote = XposedHelpers.findClass("com.android.internal.os.Zygote", null);

410
edxp-core/src/main/cpp/main/include/framework/fd_utils-inl.h
View File

@ -1,410 +0,0 @@
/*
* Copyright (C) 2016 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.
*/
#pragma once
#include <string>
#include <unordered_map>
#include <set>
#include <vector>
#include <algorithm>
#include <dirent.h>
#include <fcntl.h>
#include <grp.h>
#include <inttypes.h>
#include <stdlib.h>
#include <sys/socket.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/un.h>
#include <unistd.h>
static const char *kPathPrefixWhitelist[] = {
"/data/app/",
"/data/app-private/"
};
static const char *kFdPath = "/proc/self/fd";
// TODO stay up-to-date
// @ApiSensitive(Level.MIDDLE)
// Keeps track of all relevant information (flags, offset etc.) of an
// open zygote file descriptor.
class FileDescriptorInfo {
public:
// Create a FileDescriptorInfo for a given file descriptor. Returns
// |NULL| if an error occurred.
static FileDescriptorInfo *createFromFd(int fd) {
struct stat f_stat;
// This should never happen; the zygote should always have the right set
// of permissions required to stat all its open files.
if (TEMP_FAILURE_RETRY(fstat(fd, &f_stat)) == -1) {
LOGE("Unable to stat fd %d : %s", fd, strerror(errno));
return NULL;
}
if (S_ISSOCK(f_stat.st_mode)) {
std::string socket_name;
if (!GetSocketName(fd, &socket_name)) {
return NULL;
}
if (!IsWhitelisted(socket_name)) {
//LOGE("Socket name not whitelisted : %s (fd=%d)", socket_name.c_str(), fd);
return NULL;
}
return new FileDescriptorInfo(fd);
}
std::string file_path;
if (!Readlink(fd, &file_path)) {
return NULL;
}
if (!IsWhitelisted(file_path)) {
//LOGE("Not whitelisted : %s", file_path.c_str());
return NULL;
}
// We only handle whitelisted regular files and character devices. Whitelisted
// character devices must provide a guarantee of sensible behaviour when
// reopened.
//
// S_ISDIR : Not supported. (We could if we wanted to, but it's unused).
// S_ISLINK : Not supported.
// S_ISBLK : Not supported.
// S_ISFIFO : Not supported. Note that the zygote uses pipes to communicate
// with the child process across forks but those should have been closed
// before we got to this point.
if (!S_ISCHR(f_stat.st_mode) && !S_ISREG(f_stat.st_mode)) {
LOGE("Unsupported st_mode %d", f_stat.st_mode);
return NULL;
}
// File descriptor flags : currently on FD_CLOEXEC. We can set these
// using F_SETFD - we're single threaded at this point of execution so
// there won't be any races.
const int fd_flags = TEMP_FAILURE_RETRY(fcntl(fd, F_GETFD));
if (fd_flags == -1) {
LOGE("Failed fcntl(%d, F_GETFD) : %s", fd, strerror(errno));
return NULL;
}
// File status flags :
// - File access mode : (O_RDONLY, O_WRONLY...) we'll pass these through
// to the open() call.
//
// - File creation flags : (O_CREAT, O_EXCL...) - there's not much we can
// do about these, since the file has already been created. We shall ignore
// them here.
//
// - Other flags : We'll have to set these via F_SETFL. On linux, F_SETFL
// can only set O_APPEND, O_ASYNC, O_DIRECT, O_NOATIME, and O_NONBLOCK.
// In particular, it can't set O_SYNC and O_DSYNC. We'll have to test for
// their presence and pass them in to open().
int fs_flags = TEMP_FAILURE_RETRY(fcntl(fd, F_GETFL));
if (fs_flags == -1) {
LOGE("Failed fcntl(%d, F_GETFL) : %s", fd, strerror(errno));
return NULL;
}
// File offset : Ignore the offset for non seekable files.
const off_t offset = TEMP_FAILURE_RETRY(lseek64(fd, 0, SEEK_CUR));
// We pass the flags that open accepts to open, and use F_SETFL for
// the rest of them.
static const int kOpenFlags = (O_RDONLY | O_WRONLY | O_RDWR | O_DSYNC | O_SYNC);
int open_flags = fs_flags & (kOpenFlags);
fs_flags = fs_flags & (~(kOpenFlags));
return new FileDescriptorInfo(f_stat, file_path, fd, open_flags, fd_flags, fs_flags,
offset);
}
bool Detach() const {
const int dev_null_fd = open("/dev/null", O_RDWR);
if (dev_null_fd < 0) {
LOGE("Failed to open /dev/null : %s", strerror(errno));
return false;
}
if (dup2(dev_null_fd, fd) == -1) {
LOGE("Failed dup2 on socket descriptor %d : %s", fd, strerror(errno));
return false;
}
if (close(dev_null_fd) == -1) {
LOGE("Failed close(%d) : %s", dev_null_fd, strerror(errno));
return false;
}
return true;
}
bool Reopen() const {
if (is_sock) {
return true;
}
// NOTE: This might happen if the file was unlinked after being opened.
// It's a common pattern in the case of temporary files and the like but
// we should not allow such usage from the zygote.
const int new_fd = TEMP_FAILURE_RETRY(open(file_path.c_str(), open_flags));
if (new_fd == -1) {
LOGE("Failed open(%s, %d) : %s", file_path.c_str(), open_flags, strerror(errno));
return false;
}
if (TEMP_FAILURE_RETRY(fcntl(new_fd, F_SETFD, fd_flags)) == -1) {
close(new_fd);
LOGE("Failed fcntl(%d, F_SETFD, %x) : %s", new_fd, fd_flags, strerror(errno));
return false;
}
if (TEMP_FAILURE_RETRY(fcntl(new_fd, F_SETFL, fs_flags)) == -1) {
close(new_fd);
LOGE("Failed fcntl(%d, F_SETFL, %x) : %s", new_fd, fs_flags, strerror(errno));
return false;
}
if (offset != -1 && TEMP_FAILURE_RETRY(lseek64(new_fd, offset, SEEK_SET)) == -1) {
close(new_fd);
LOGE("Failed lseek64(%d, SEEK_SET) : %s", new_fd, strerror(errno));
return false;
}
if (TEMP_FAILURE_RETRY(dup2(new_fd, fd)) == -1) {
close(new_fd);
LOGE("Failed dup2(%d, %d) : %s", fd, new_fd, strerror(errno));
return false;
}
close(new_fd);
return true;
}
const int fd;
const struct stat stat;
const std::string file_path;
const int open_flags;
const int fd_flags;
const int fs_flags;
const off_t offset;
const bool is_sock;
private:
FileDescriptorInfo(int pfd) :
fd(pfd),
stat(),
open_flags(0),
fd_flags(0),
fs_flags(0),
offset(0),
is_sock(true) {
}
FileDescriptorInfo(struct stat pstat, const std::string &pfile_path, int pfd, int popen_flags,
int pfd_flags, int pfs_flags, off_t poffset) :
fd(pfd),
stat(pstat),
file_path(pfile_path),
open_flags(popen_flags),
fd_flags(pfd_flags),
fs_flags(pfs_flags),
offset(poffset),
is_sock(false) {
}
// Returns true iff. a given path is whitelisted.
static bool IsWhitelisted(const std::string &path) {
for (size_t i = 0;
i < (sizeof(kPathPrefixWhitelist) / sizeof(kPathPrefixWhitelist[0])); ++i) {
if (path.compare(0, strlen(kPathPrefixWhitelist[i]), kPathPrefixWhitelist[i]) == 0) {
return true;
}
}
return false;
}
// TODO: Call android::base::Readlink instead of copying the code here.
static bool Readlink(const int fd, std::string *result) {
char path[64];
snprintf(path, sizeof(path), "/proc/self/fd/%d", fd);
// Code copied from android::base::Readlink starts here :
// Annoyingly, the readlink system call returns EINVAL for a zero-sized buffer,
// and truncates to whatever size you do supply, so it can't be used to query.
// We could call lstat first, but that would introduce a race condition that
// we couldn't detect.
// ext2 and ext4 both have PAGE_SIZE limitations, so we assume that here.
char *buf = new char[4096];
ssize_t len = readlink(path, buf, 4096);
if (len == -1) {
delete[] buf;
return false;
}
result->assign(buf, len);
delete[] buf;
return true;
}
// Returns the locally-bound name of the socket |fd|. Returns true
// iff. all of the following hold :
//
// - the socket's sa_family is AF_UNIX.
// - the length of the path is greater than zero (i.e, not an unnamed socket).
// - the first byte of the path isn't zero (i.e, not a socket with an abstract
// address).
static bool GetSocketName(const int fd, std::string *result) {
sockaddr_storage ss;
sockaddr *addr = reinterpret_cast<sockaddr *>(&ss);
socklen_t addr_len = sizeof(ss);
if (TEMP_FAILURE_RETRY(getsockname(fd, addr, &addr_len)) == -1) {
LOGE("Failed getsockname(%d) : %s", fd, strerror(errno));
return false;
}
#if PLATFORM_SDK_VERSION <= 23
if (addr->sa_family == AF_NETLINK) {
(*result) = "@netlink@";
return true;
}
#endif
if (addr->sa_family != AF_UNIX) {
//LOGE("Unsupported socket (fd=%d) with family %d", fd, addr->sa_family);
return false;
}
const sockaddr_un *unix_addr = reinterpret_cast<const sockaddr_un *>(&ss);
size_t path_len = addr_len - offsetof(struct sockaddr_un, sun_path);
// This is an unnamed local socket, we do not accept it.
if (path_len == 0) {
//LOGE("Unsupported AF_UNIX socket (fd=%d) with empty path.", fd);
return false;
}
// This is a local socket with an abstract address, we do not accept it.
if (unix_addr->sun_path[0] == '\0') {
//LOGE("Unsupported AF_UNIX socket (fd=%d) with abstract address.", fd);
return false;
}
// If we're here, sun_path must refer to a null terminated filesystem
// pathname (man 7 unix). Remove the terminator before assigning it to an
// std::string.
if (unix_addr->sun_path[path_len - 1] == '\0') {
--path_len;
}
result->assign(unix_addr->sun_path, path_len);
return true;
}
// DISALLOW_COPY_AND_ASSIGN(FileDescriptorInfo);
FileDescriptorInfo(const FileDescriptorInfo &);
void operator=(const FileDescriptorInfo &);
};
// A FileDescriptorTable is a collection of FileDescriptorInfo objects
// keyed by their FDs.
class FileDescriptorTable {
public:
// Creates a new FileDescriptorTable. This function scans
// /proc/self/fd for the list of open file descriptors and collects
// information about them. Returns NULL if an error occurs.
static FileDescriptorTable *Create() {
DIR *d = opendir(kFdPath);
if (d == NULL) {
LOGE("Unable to open directory %s: %s", kFdPath, strerror(errno));
return NULL;
}
int dir_fd = dirfd(d);
dirent *e;
std::unordered_map<int, FileDescriptorInfo *> open_fd_map;
while ((e = readdir(d)) != NULL) {
const int fd = ParseFd(e, dir_fd);
if (fd == -1) {
continue;
}
FileDescriptorInfo *info = FileDescriptorInfo::createFromFd(fd);
if (info == NULL) {
continue;
}
info->Detach();
open_fd_map[fd] = info;
}
if (closedir(d) == -1) {
LOGE("Unable to close directory : %s", strerror(errno));
return NULL;
}
return new FileDescriptorTable(open_fd_map);
}
// Reopens all file descriptors that are contained in the table.
void Reopen() {
std::unordered_map<int, FileDescriptorInfo *>::const_iterator it;
for (it = open_fd_map_.begin(); it != open_fd_map_.end(); ++it) {
const FileDescriptorInfo *info = it->second;
if (info != NULL) {
info->Reopen();
delete info;
}
}
}
private:
FileDescriptorTable(const std::unordered_map<int, FileDescriptorInfo *> &map)
: open_fd_map_(map) {
}
static int ParseFd(dirent *e, int dir_fd) {
char *end;
const int fd = strtol(e->d_name, &end, 10);
if ((*end) != '\0') {
return -1;
}
// Don't bother with the standard input/output/error, they're handled
// specially post-fork anyway.
if (fd <= STDERR_FILENO || fd == dir_fd) {
return -1;
}
return fd;
}
// Invariant: All values in this unordered_map are non-NULL.
std::unordered_map<int, FileDescriptorInfo *> open_fd_map_;
// DISALLOW_COPY_AND_ASSIGN(FileDescriptorTable);
FileDescriptorTable(const FileDescriptorTable &);
void operator=(const FileDescriptorTable &);
};

2
edxp-core/src/main/cpp/main/src/edxp_context.cpp
View File

@ -7,7 +7,6 @@
#include <jni/art_class_linker.h>
#include <jni/art_heap.h>
#include <jni/edxp_yahfa.h>
#include <jni/framework_zygote.h>
#include <jni/edxp_resources_hook.h>
#include <dl_util.h>
#include <art/runtime/jni_env_ext.h>
@ -100,7 +99,6 @@ namespace edxp {
FindClassFromLoader(env, GetCurrentClassLoader(), kEntryClassName)));
RegisterEdxpResourcesHook(env);
RegisterFrameworkZygote(env);
RegisterConfigManagerMethods(env);
RegisterArtClassLinker(env);
RegisterArtHeap(env);

36
edxp-core/src/main/cpp/main/src/jni/framework_zygote.cpp
View File

@ -1,36 +0,0 @@
#include <jni.h>
#include <native_util.h>
#include <nativehelper/jni_macros.h>
#include <framework/fd_utils-inl.h>
#include "framework_zygote.h"
namespace edxp {
static FileDescriptorTable *gClosedFdTable = nullptr;
static void Zygote_closeFilesBeforeFork(JNI_START) {
// FIXME what if gClosedFdTable is not null
gClosedFdTable = FileDescriptorTable::Create();
}
static void Zygote_reopenFilesAfterFork(JNI_START) {
if (!gClosedFdTable) {
LOGE("gClosedFdTable is null when reopening files");
return;
}
gClosedFdTable->Reopen();
delete gClosedFdTable;
gClosedFdTable = nullptr;
}
static JNINativeMethod gMethods[] = {
NATIVE_METHOD(Zygote, closeFilesBeforeFork, "()V"),
NATIVE_METHOD(Zygote, reopenFilesAfterFork, "()V")
};
void RegisterFrameworkZygote(JNIEnv *env) {
REGISTER_EDXP_NATIVE_METHODS("com.elderdrivers.riru.edxp.framework.Zygote");
}
}

10
edxp-core/src/main/cpp/main/src/jni/framework_zygote.h
View File

@ -1,10 +0,0 @@
#pragma once
#include "jni.h"
namespace edxp {
void RegisterFrameworkZygote(JNIEnv *);
} // namespace edxp

3
edxp-core/src/main/cpp/main/src/main.cpp
View File

@ -19,7 +19,6 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunused-value"
#define quote(sequence) "\"" #sequence "\""
namespace edxp {
// TODO exclude unrelated processes
@ -117,7 +116,7 @@ RIRU_EXPORT void *init(void *arg) {
module->supportHide = true;
module->version = RIRU_MODULE_VERSION;
module->versionName = quote(RIRU_MODULE_VERSION_NAME);
module->versionName = STRINGIFY(RIRU_MODULE_VERSION_NAME);
module->onModuleLoaded = edxp::onModuleLoaded;
module->shouldSkipUid = edxp::shouldSkipUid;
module->forkAndSpecializePre = edxp::nativeForkAndSpecializePre;