mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-02-25 07:19:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Don't modify argument block on MacOS Arm64

Browse source 
Some dynamic library had access to this information somehow and was
crashing when it didn't have the expected structure.
This commit is contained in:
Justine Tunney 2023-11-12 05:48:18 -08:00
parent 0863427b3a
commit bcf268adf8
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
2 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
ape/ape-m1.c
View file

@ -937,6 +937,21 @@ int main(int argc, char **argv, char **envp) {
sp = (long *)(argv - 1); sp = (long *)(argv - 1);
auxv = (long *)(envp + i + 1); auxv = (long *)(envp + i + 1);
/* create new bottom of stack for spawned program
system v abi aligns this on a 16-byte boundary
grows down the alloc by poking the guard pages */
n = (auxv - sp + AUXV_WORDS + 1) * sizeof(long);
sp2 = (long *)__builtin_alloca(n);
if ((long)sp2 & 15) ++sp2;
for (; n > 0; n -= pagesz) {
((char *)sp2)[n - 1] = 0;
}
memmove(sp2, sp, (auxv - sp) * sizeof(long));
argv = (char **)(sp2 + 1);
envp = (char **)(sp2 + 1 + argc + 1);
auxv = sp2 + (auxv - sp);
sp = sp2;
/* interpret command line arguments */ /* interpret command line arguments */
if ((M->ps.literally = argc >= 3 && !StrCmp(argv[1], "-"))) { if ((M->ps.literally = argc >= 3 && !StrCmp(argv[1], "-"))) {
/* if the first argument is a hyphen then we give the user the /* if the first argument is a hyphen then we give the user the
@ -959,21 +974,6 @@ int main(int argc, char **argv, char **envp) {
argv = (char **)((sp += 1) + 1); argv = (char **)((sp += 1) + 1);
} }
/* create new bottom of stack for spawned program
system v abi aligns this on a 16-byte boundary
grows down the alloc by poking the guard pages */
n = (auxv - sp + AUXV_WORDS + 1) * sizeof(long);
sp2 = (long *)__builtin_alloca(n);
if ((long)sp2 & 15) ++sp2;
for (; n > 0; n -= pagesz) {
((char *)sp2)[n - 1] = 0;
}
memmove(sp2, sp, (auxv - sp) * sizeof(long));
argv = (char **)(sp2 + 1);
envp = (char **)(sp2 + 1 + argc + 1);
auxv = sp2 + (auxv - sp);
sp = sp2;
/* allocate ephemeral memory for reading file */ /* allocate ephemeral memory for reading file */
n = sizeof(union ElfEhdrBuf); n = sizeof(union ElfEhdrBuf);
ebuf = (union ElfEhdrBuf *)__builtin_alloca(n); ebuf = (union ElfEhdrBuf *)__builtin_alloca(n);

7
test/posix/sigchld_test.c
View file

@ -73,9 +73,10 @@ void OnSigchld(int sig, siginfo_t *si, void *arg) {
EXPECT_EQ(42, WEXITSTATUS(ws)); EXPECT_EQ(42, WEXITSTATUS(ws));
EXPECT_EQ(SIGCHLD, sig); EXPECT_EQ(SIGCHLD, sig);
EXPECT_EQ(SIGCHLD, si->si_signo); EXPECT_EQ(SIGCHLD, si->si_signo);
EXPECT_EQ(CLD_EXITED, si->si_code); // these fields aren't very portable
EXPECT_EQ(sigchld_pid, si->si_pid); // EXPECT_EQ(CLD_EXITED, si->si_code);
EXPECT_EQ(getuid(), si->si_uid); // EXPECT_EQ(sigchld_pid, si->si_pid);
// EXPECT_EQ(getuid(), si->si_uid);
EXPECT_NE(NULL, ctx); EXPECT_NE(NULL, ctx);
sigchld_got_signal = true; sigchld_got_signal = true;
} }