diff options
| author | Patrick Mochel <mochel@osdl.org> | 2002-12-01 01:18:34 -0600 |
|---|---|---|
| committer | Patrick Mochel <mochel@osdl.org> | 2002-12-01 01:18:34 -0600 |
| commit | b00a75ab131dc8ea758b1354428521d0f6279610 (patch) | |
| tree | 93ce1841f2ef4fb0886e021d464876d47f0d4e99 /fs/exec.c | |
| parent | 6f3caf1587dbccd4cab287c7319af8270a0057e3 (diff) | |
| parent | c9e540101f043fe4a713781513d675e3f3577b55 (diff) | |
Merge osdl.org:/home/mochel/src/kernel/devel/linux-2.5-virgin
into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-core
Diffstat (limited to 'fs/exec.c')
| -rw-r--r-- | fs/exec.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/fs/exec.c b/fs/exec.c index 3757201478c3..a0a4aa824ae6 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -841,7 +841,8 @@ int prepare_binprm(struct linux_binprm *bprm) } /* fill in binprm security blob */ - if ((retval = security_bprm_set(bprm))) + retval = security_bprm_set(bprm); + if (retval) return retval; memset(bprm->buf,0,BINPRM_BUF_SIZE); @@ -958,7 +959,8 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs) } } #endif - if ((retval = security_bprm_check(bprm))) + retval = security_bprm_check(bprm); + if (retval) return retval; /* kernel module loader fixup */ @@ -1054,7 +1056,8 @@ int do_execve(char * filename, char ** argv, char ** envp, struct pt_regs * regs if ((retval = bprm.envc) < 0) goto out_mm; - if ((retval = security_bprm_alloc(&bprm))) + retval = security_bprm_alloc(&bprm); + if (retval) goto out; retval = prepare_binprm(&bprm); |