mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-08-06 18:00:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Pass preserve-argv[0] from M1 loader

Browse source
This commit is contained in:
Jōshin 2024-01-07 01:39:40 -05:00
parent d73e77d079
commit 3725b77e8d
No known key found for this signature in database
2 changed files with 57 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

107
ape/ape-m1.c
View file

@ -103,36 +103,39 @@ struct Syslib {
char *(*dlerror)(void); char *(*dlerror)(void);
}; };
#define ELFCLASS32 1 #define ELFCLASS32 1
#define ELFDATA2LSB 1 #define ELFDATA2LSB 1
#define EM_AARCH64 183 #define EM_AARCH64 183
#define ET_EXEC 2 #define ET_EXEC 2
#define ET_DYN 3 #define ET_DYN 3
#define PT_LOAD 1 #define PT_LOAD 1
#define PT_DYNAMIC 2 #define PT_DYNAMIC 2
#define PT_INTERP 3 #define PT_INTERP 3
#define EI_CLASS 4 #define EI_CLASS 4
#define EI_DATA 5 #define EI_DATA 5
#define PF_X 1 #define PF_X 1
#define PF_W 2 #define PF_W 2
#define PF_R 4 #define PF_R 4
#define AT_PHDR 3 #define AT_PHDR 3
#define AT_PHENT 4 #define AT_PHENT 4
#define AT_PHNUM 5 #define AT_PHNUM 5
#define AT_PAGESZ 6 #define AT_PAGESZ 6
#define AT_BASE 7 #define AT_BASE 7
#define AT_ENTRY 9 #define AT_FLAGS 8
#define AT_UID 11 #define AT_FLAGS_PRESERVE_ARGV0_BIT 0
#define AT_EUID 12 #define AT_FLAGS_PRESERVE_ARGV0 (1 << AT_FLAGS_PRESERVE_ARGV0_BIT)
#define AT_GID 13 #define AT_ENTRY 9
#define AT_EGID 14 #define AT_UID 11
#define AT_HWCAP 16 #define AT_EUID 12
#define AT_HWCAP2 16 #define AT_GID 13
#define AT_SECURE 23 #define AT_EGID 14
#define AT_RANDOM 25 #define AT_HWCAP 16
#define AT_EXECFN 31 #define AT_HWCAP2 16
#define AT_SECURE 23
#define AT_RANDOM 25
#define AT_EXECFN 31
#define AUXV_WORDS 29 #define AUXV_WORDS 31
/* from the xnu codebase */ /* from the xnu codebase */
#define _COMM_PAGE_START_ADDRESS 0x0000000FFFFFC000ul #define _COMM_PAGE_START_ADDRESS 0x0000000FFFFFC000ul
@ -765,7 +768,7 @@ __attribute__((__noreturn__)) static void Spawn(const char *exe, int fd,
static const char *TryElf(struct ApeLoader *M, union ElfEhdrBuf *ebuf, static const char *TryElf(struct ApeLoader *M, union ElfEhdrBuf *ebuf,
const char *exe, int fd, long *sp, long *auxv, const char *exe, int fd, long *sp, long *auxv,
char *execfn) { char *execfn, char literally) {
long i, rc; long i, rc;
unsigned size; unsigned size;
struct ElfEhdr *e; struct ElfEhdr *e;
@ -861,25 +864,27 @@ static const char *TryElf(struct ApeLoader *M, union ElfEhdrBuf *ebuf,
auxv[7] = ebuf->ehdr.e_entry; auxv[7] = ebuf->ehdr.e_entry;
auxv[8] = AT_PAGESZ; auxv[8] = AT_PAGESZ;
auxv[9] = pagesz; auxv[9] = pagesz;
auxv[10] = AT_UID; auxv[10] = AT_FLAGS;
auxv[11] = getuid(); auxv[11] = literally ? AT_FLAGS_PRESERVE_ARGV0 : 0;
auxv[12] = AT_EUID; auxv[12] = AT_UID;
auxv[13] = geteuid(); auxv[13] = getuid();
auxv[14] = AT_GID; auxv[14] = AT_EUID;
auxv[15] = getgid(); auxv[15] = geteuid();
auxv[16] = AT_EGID; auxv[16] = AT_GID;
auxv[17] = getegid(); auxv[17] = getgid();
auxv[18] = AT_HWCAP; auxv[18] = AT_EGID;
auxv[19] = 0xffb3ffffu; auxv[19] = getegid();
auxv[20] = AT_HWCAP2; auxv[20] = AT_HWCAP;
auxv[21] = 0x181; auxv[21] = 0xffb3ffffu;
auxv[22] = AT_SECURE; auxv[22] = AT_HWCAP2;
auxv[23] = issetugid(); auxv[23] = 0x181;
auxv[24] = AT_RANDOM; auxv[24] = AT_SECURE;
auxv[25] = (long)M->rando; auxv[25] = issetugid();
auxv[26] = AT_EXECFN; auxv[26] = AT_RANDOM;
auxv[27] = (long)execfn; auxv[27] = (long)M->rando;
auxv[28] = 0; auxv[28] = AT_EXECFN;
auxv[29] = (long)execfn;
auxv[30] = 0;
/* we're now ready to load */ /* we're now ready to load */
Spawn(exe, fd, sp, e, p, &M->lib, M->ps.path); Spawn(exe, fd, sp, e, p, &M->lib, M->ps.path);
@ -1076,9 +1081,9 @@ int main(int argc, char **argv, char **envp) {
} }
} }
if (i >= sizeof(ebuf->ehdr)) { if (i >= sizeof(ebuf->ehdr)) {
TryElf(M, ebuf, exe, fd, sp, auxv, execfn); TryElf(M, ebuf, exe, fd, sp, auxv, execfn, M->ps.literally);
} }
} }
} }
Pexit(exe, 0, TryElf(M, ebuf, exe, fd, sp, auxv, execfn)); Pexit(exe, 0, TryElf(M, ebuf, exe, fd, sp, auxv, execfn, M->ps.literally));
} }

3
test/libc/calls/getprogramexecutablename_test.c
View file

@ -58,8 +58,7 @@ void SetUpOnce(void) {
skiptests = IsOpenbsd() || (IsXnu() && !IsXnuSilicon()); skiptests = IsOpenbsd() || (IsXnu() && !IsXnuSilicon());
} }
} else { } else {
skiparg0 = skiparg0 = !(getauxval(AT_FLAGS) & AT_FLAGS_PRESERVE_ARGV0);
!(IsXnuSilicon() || (getauxval(AT_FLAGS) & AT_FLAGS_PRESERVE_ARGV0));
} }
fprintf(stderr, loaded ? "loaded\n" : "not loaded\n"); fprintf(stderr, loaded ? "loaded\n" : "not loaded\n");
if (skiptests) { if (skiptests) {