diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
| commit | 24bfb00123e82a2e70bd115277d922438813515b (patch) | |
| tree | 27328b8a5718e16d64e2d101f4b7ddcad5930aed /fs/binfmt_elf_fdpic.c | |
| parent | c6135234550ed89a6fd0e8cb229633967e41d649 (diff) | |
| parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'fs/binfmt_elf_fdpic.c')
| -rw-r--r-- | fs/binfmt_elf_fdpic.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c index dda87c4c82a3..e0344f69c79d 100644 --- a/fs/binfmt_elf_fdpic.c +++ b/fs/binfmt_elf_fdpic.c | |||
| @@ -411,16 +411,11 @@ error: | |||
| 411 | allow_write_access(interpreter); | 411 | allow_write_access(interpreter); |
| 412 | fput(interpreter); | 412 | fput(interpreter); |
| 413 | } | 413 | } |
| 414 | if (interpreter_name) | 414 | kfree(interpreter_name); |
| 415 | kfree(interpreter_name); | 415 | kfree(exec_params.phdrs); |
| 416 | if (exec_params.phdrs) | 416 | kfree(exec_params.loadmap); |
| 417 | kfree(exec_params.phdrs); | 417 | kfree(interp_params.phdrs); |
| 418 | if (exec_params.loadmap) | 418 | kfree(interp_params.loadmap); |
| 419 | kfree(exec_params.loadmap); | ||
| 420 | if (interp_params.phdrs) | ||
| 421 | kfree(interp_params.phdrs); | ||
| 422 | if (interp_params.loadmap) | ||
| 423 | kfree(interp_params.loadmap); | ||
| 424 | return retval; | 419 | return retval; |
| 425 | 420 | ||
| 426 | /* unrecoverable error - kill the process */ | 421 | /* unrecoverable error - kill the process */ |