Re: [PATCH] Remove double initialization of retval in load_misc_binary()

Vitaly Mayatskikh
2009-04-08T07:56:51Z

At Wed, 8 Apr 2009 10:32:48 +0300, Kirill A. Shutemov wrote:

> Probably, better way is removing both 'retval = -ENOEXEC;'  and initialize it within definition.

Agree.

Signed-off-by: Vitaly Mayatskikh <v.mayatskih@gmail.com>

diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c
index c4e8353..f10150f 100644
--- a/fs/binfmt_misc.c
+++ b/fs/binfmt_misc.c
@@ -109,14 +109,12 @@ static int load_misc_binary(struct linux_binprm *bprm, struct pt_regs *regs)
struct file * interp_file = NULL;
char iname[BINPRM_BUF_SIZE];
char *iname_addr = iname;
- int retval;
+ int retval = -ENOEXEC;
int fd_binary = -1;

- retval = -ENOEXEC;
if (!enabled)
goto _ret;

- retval = -ENOEXEC;
if (bprm->recursion_depth > BINPRM_MAX_RECURSION)
goto _ret;

--
wbr, Vitaly