xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

kernel: handle amd64 40 byte headers in exec()

Browse source
This commit is contained in:
cinap_lenrek 2014-02-01 10:16:55 +01:00
parent 88476df541
commit 7613608b23
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sys/src/9/port/sysproc.c
View file

@ -243,7 +243,7 @@ sysexec(va_list list)
char *a, *charp, *args, *file, *file0; char *a, *charp, *args, *file, *file0;
char *progarg[sizeof(Exec)/2+1], *elem, progelem[64]; char *progarg[sizeof(Exec)/2+1], *elem, progelem[64];
ulong magic, ssize, nargs, nbytes, n; ulong magic, ssize, nargs, nbytes, n;
uintptr t, d, b, entry, bssend, text, data, bss, tstk; uintptr t, d, b, entry, bssend, text, data, bss, tstk, align;
int indir; int indir;
Exec exec; Exec exec;
char line[sizeof(Exec)]; char line[sizeof(Exec)];
@ -266,6 +266,7 @@ sysexec(va_list list)
pexit(up->errstr, 1); pexit(up->errstr, 1);
nexterror(); nexterror();
} }
align = BY2PG;
indir = 0; indir = 0;
file = file0; file = file0;
for(;;){ for(;;){
@ -284,6 +285,10 @@ sysexec(va_list list)
text = l2be(exec.text); text = l2be(exec.text);
entry = l2be(exec.entry); entry = l2be(exec.entry);
if(n==sizeof(Exec) && (magic == AOUT_MAGIC)){ if(n==sizeof(Exec) && (magic == AOUT_MAGIC)){
if(magic == S_MAGIC){
text += 8;
align = 0x200000ull; /* 2MB segment alignment for amd64 */
}
if(text >= (USTKTOP-USTKSIZE)-(UTZERO+sizeof(Exec)) if(text >= (USTKTOP-USTKSIZE)-(UTZERO+sizeof(Exec))
|| entry < UTZERO+sizeof(Exec) || entry < UTZERO+sizeof(Exec)
|| entry >= UTZERO+sizeof(Exec)+text) || entry >= UTZERO+sizeof(Exec)+text)
@ -318,10 +323,12 @@ sysexec(va_list list)
data = l2be(exec.data); data = l2be(exec.data);
bss = l2be(exec.bss); bss = l2be(exec.bss);
t = (UTZERO+sizeof(Exec)+text+(BY2PG-1)) & ~(BY2PG-1); align--;
d = (t + data + (BY2PG-1)) & ~(BY2PG-1); t = (UTZERO+sizeof(Exec)+text+align) & ~align;
align = BY2PG-1;
d = (t + data + align) & ~align;
bssend = t + data + bss; bssend = t + data + bss;
b = (bssend + (BY2PG-1)) & ~(BY2PG-1); b = (bssend + align) & ~align;
if(t >= (USTKTOP-USTKSIZE) || d >= (USTKTOP-USTKSIZE) || b >= (USTKTOP-USTKSIZE)) if(t >= (USTKTOP-USTKSIZE) || d >= (USTKTOP-USTKSIZE) || b >= (USTKTOP-USTKSIZE))
error(Ebadexec); error(Ebadexec);