* [PATCH] remove NULL checks before kfree in binfmt_elf_fdpic.c and binfmt_elf.c
@ 2005-03-22 23:04 Jesper Juhl
2005-03-23 10:42 ` David Howells
0 siblings, 1 reply; 2+ messages in thread
From: Jesper Juhl @ 2005-03-22 23:04 UTC (permalink / raw)
To: linux-kernel; +Cc: David Howells, Eric Youngdale
remove redundant NULL checks before kfree() in fs/binfmt_elf_fdpic.c and
fs/binfmt_elf.c
Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
--- linux-2.6.12-rc1-mm1-orig/fs/binfmt_elf_fdpic.c 2005-03-21 23:15:43.000000000 +0100
+++ linux-2.6.12-rc1-mm1/fs/binfmt_elf_fdpic.c 2005-03-22 23:59:31.000000000 +0100
@@ -418,16 +418,11 @@ error:
allow_write_access(interpreter);
fput(interpreter);
}
- if (interpreter_name)
- kfree(interpreter_name);
- if (exec_params.phdrs)
- kfree(exec_params.phdrs);
- if (exec_params.loadmap)
- kfree(exec_params.loadmap);
- if (interp_params.phdrs)
- kfree(interp_params.phdrs);
- if (interp_params.loadmap)
- kfree(interp_params.loadmap);
+ kfree(interpreter_name);
+ kfree(exec_params.phdrs);
+ kfree(exec_params.loadmap);
+ kfree(interp_params.phdrs);
+ kfree(interp_params.loadmap);
return retval;
/* unrecoverable error - kill the process */
--- linux-2.6.12-rc1-mm1-orig/fs/binfmt_elf.c 2005-03-21 23:15:43.000000000 +0100
+++ linux-2.6.12-rc1-mm1/fs/binfmt_elf.c 2005-03-23 00:02:11.000000000 +0100
@@ -1006,8 +1006,7 @@ out_free_dentry:
if (interpreter)
fput(interpreter);
out_free_interp:
- if (elf_interpreter)
- kfree(elf_interpreter);
+ kfree(elf_interpreter);
out_free_file:
sys_close(elf_exec_fileno);
out_free_fh:
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] remove NULL checks before kfree in binfmt_elf_fdpic.c and binfmt_elf.c
2005-03-22 23:04 [PATCH] remove NULL checks before kfree in binfmt_elf_fdpic.c and binfmt_elf.c Jesper Juhl
@ 2005-03-23 10:42 ` David Howells
0 siblings, 0 replies; 2+ messages in thread
From: David Howells @ 2005-03-23 10:42 UTC (permalink / raw)
To: Jesper Juhl; +Cc: linux-kernel, Eric Youngdale
Jesper Juhl <juhl-lkml@dif.dk> wrote:
> remove redundant NULL checks before kfree() in fs/binfmt_elf_fdpic.c and
> fs/binfmt_elf.c
The FDPIC bit looks okay.
Acked-By: David Howells <dhowells@redhat.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2005-03-23 10:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-03-22 23:04 [PATCH] remove NULL checks before kfree in binfmt_elf_fdpic.c and binfmt_elf.c Jesper Juhl
2005-03-23 10:42 ` David Howells
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox