summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sysfile.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/kernel/sysfile.c b/kernel/sysfile.c
index 5b09d93..7768d20 100644
--- a/kernel/sysfile.c
+++ b/kernel/sysfile.c
@@ -421,10 +421,10 @@ sys_exec(void)
memset(argv, 0, sizeof(argv));
for(i=0;; i++){
if(i >= NELEM(argv)){
- return -1;
+ goto bad;
}
if(fetchaddr(uargv+sizeof(uint64)*i, (uint64*)&uarg) < 0){
- return -1;
+ goto bad;
}
if(uarg == 0){
argv[i] = 0;
@@ -434,7 +434,7 @@ sys_exec(void)
if(argv[i] == 0)
panic("sys_exec kalloc");
if(fetchstr(uarg, argv[i], PGSIZE) < 0){
- return -1;
+ goto bad;
}
}
@@ -444,6 +444,11 @@ sys_exec(void)
kfree(argv[i]);
return ret;
+
+ bad:
+ for(i = 0; i < NELEM(argv) && argv[i] != 0; i++)
+ kfree(argv[i]);
+ return -1;
}
uint64