[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/42] bsd-user: implement path searching
From: |
imp |
Subject: |
[PULL 10/42] bsd-user: implement path searching |
Date: |
Tue, 7 Sep 2021 15:53:00 -0600 |
From: Warner Losh <imp@bsdimp.com>
Use the PATH to find the executable given a bare argument. We need to do
this so we can implement mixing native and emulated binaries (e.g.,
execing a x86 native binary from an emulated arm binary to optimize
parts of the build). By finding the binary, we will know how to exec it.
Signed-off-by: Stacey Son <sson@FreeBSD.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
bsd-user/bsdload.c | 36 +++++++++++++++++++++++++++++++++++-
bsd-user/qemu.h | 3 ++-
2 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/bsd-user/bsdload.c b/bsd-user/bsdload.c
index 379015c744..32f7fd5dec 100644
--- a/bsd-user/bsdload.c
+++ b/bsd-user/bsdload.c
@@ -139,21 +139,55 @@ abi_ulong loader_build_argptr(int envc, int argc,
abi_ulong sp,
return sp;
}
+static bool is_there(const char *candidate)
+{
+ struct stat fin;
+
+ /* XXX work around access(2) false positives for superuser */
+ if (access(candidate, X_OK) == 0 && stat(candidate, &fin) == 0 &&
+ S_ISREG(fin.st_mode) && (getuid() != 0 ||
+ (fin.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)) != 0)) {
+ return true;
+ }
+
+ return false;
+}
+
int loader_exec(const char *filename, char **argv, char **envp,
struct target_pt_regs *regs, struct image_info *infop,
struct bsd_binprm *bprm)
{
+ char *path, fullpath[PATH_MAX];
int retval, i;
bprm->p = TARGET_PAGE_SIZE * MAX_ARG_PAGES;
for (i = 0; i < MAX_ARG_PAGES; i++) { /* clear page-table */
bprm->page[i] = NULL;
}
- retval = open(filename, O_RDONLY);
+
+ if (strchr(filename, '/') != NULL) {
+ path = realpath(filename, fullpath);
+ if (path == NULL) {
+ /* Failed to resolve. */
+ return -1;
+ }
+ if (!is_there(path)) {
+ return -1;
+ }
+ } else {
+ path = g_find_program_in_path(filename);
+ if (path == NULL) {
+ return -1;
+ }
+ }
+
+ retval = open(path, O_RDONLY);
if (retval < 0) {
+ g_free(path);
return retval;
}
+ bprm->fullpath = path;
bprm->fd = retval;
bprm->filename = (char *)filename;
bprm->argc = count(argv);
diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h
index 5237e35f9c..6b601ce4b5 100644
--- a/bsd-user/qemu.h
+++ b/bsd-user/qemu.h
@@ -124,7 +124,8 @@ struct bsd_binprm {
int argc, envc;
char **argv;
char **envp;
- char *filename; /* Name of binary */
+ char *filename; /* (Given) Name of binary */
+ char *fullpath; /* Full path of binary */
};
void do_init_thread(struct target_pt_regs *regs, struct image_info *infop);
--
2.32.0
- [PULL 01/42] bsd-user: remove sparc and sparc64, (continued)
- [PULL 01/42] bsd-user: remove sparc and sparc64, imp, 2021/09/07
- [PULL 06/42] bsd-user: Remove all non-x86 code from elfload.c, imp, 2021/09/07
- [PULL 03/42] bsd-user: Add Stacey's copyright to main.c, imp, 2021/09/07
- [PULL 08/42] bsd-user: pass the bsd_param into loader_exec, imp, 2021/09/07
- [PULL 13/42] bsd-user: TARGET_NGROUPS unused in this file, remove, imp, 2021/09/07
- [PULL 07/42] bsd-user: move arch specific defines out of elfload.c, imp, 2021/09/07
- [PULL 09/42] bsd-user: Fix calculation of size to allocate, imp, 2021/09/07
- [PULL 12/42] bsd-user: remove a.out support, imp, 2021/09/07
- [PULL 17/42] bsd-user: Include host-os.h from main, imp, 2021/09/07
- [PULL 22/42] bsd-user: Include more things in qemu.h, imp, 2021/09/07
- [PULL 10/42] bsd-user: implement path searching,
imp <=
- [PULL 15/42] bsd-user: assume pthreads and support of __thread, imp, 2021/09/07
- [PULL 14/42] bsd-user: elfload: simplify bswap a bit., imp, 2021/09/07
- [PULL 16/42] bsd-user: add host-os.h, imp, 2021/09/07
- [PULL 18/42] bsd-user: save the path to the qemu emulator, imp, 2021/09/07
- [PULL 19/42] bsd-user: start to move target CPU functions to target_arch*, imp, 2021/09/07
- [PULL 29/42] bsd-user: Add architecture specific signal tramp code, imp, 2021/09/07
- [PULL 23/42] bsd-user: define max args in terms of pages, imp, 2021/09/07
- [PULL 25/42] bsd-user: Add system independent stack, data and text limiting, imp, 2021/09/07
- [PULL 21/42] bsd-user: pull in target_arch_thread.h update target_arch_elf.h, imp, 2021/09/07
- [PULL 27/42] bsd-user: Implement --seed and initialize random state, imp, 2021/09/07