greg/xv6
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

check exec() arg length

Browse source 
fix double iunlockput
This commit is contained in:
Robert Morris 2010-09-27 16:17:57 -04:00
parent 4655d42e3b
commit 06feabecee
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
exec.c
View file

@ -44,6 +44,7 @@ exec(char *path, char **argv)
goto bad; goto bad;
} }
iunlockput(ip); iunlockput(ip);
ip = 0;
// Allocate a one-page stack at the next page boundary // Allocate a one-page stack at the next page boundary
sz = PGROUNDUP(sz); sz = PGROUNDUP(sz);
@ -105,6 +106,9 @@ exec(char *path, char **argv)
uint ffffffff = 0xffffffff; uint ffffffff = 0xffffffff;
copyout(pgdir, sp, &ffffffff, 4); copyout(pgdir, sp, &ffffffff, 4);
if(sp < sz - PGSIZE)
goto bad;
// Save program name for debugging. // Save program name for debugging.
for(last=s=path; *s; s++) for(last=s=path; *s; s++)
if(*s == '/') if(*s == '/')
@ -125,8 +129,9 @@ exec(char *path, char **argv)
return 0; return 0;
bad: bad:
cprintf("kernel: exec failed\n"); if(pgdir)
if(pgdir) freevm(pgdir); freevm(pgdir);
if(ip)
iunlockput(ip); iunlockput(ip);
return -1; return -1;
} }