Skip to contentSkip to conversation

Remove double initialization of retval in load_misc_binary()

PATCH Vitaly Mayatskikh 2 participants 2 messages Apr 8, 2009 – Apr 10, 2009 2 messages not in the archive

Subsystems (2)
lore
Share & tools
lore
#2 lore raw
In reply to a message not in the archive
Quoted 1 line · Kirill A. Shutemov

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

Agree.

fs/binfmt_misc.c +1 -3
index c4e8353..f10150f 100644
@@ -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;
 
Signature · 1 line
wbr, Vitaly
#3 lore raw
Quoted 18 lines · On Wed, 08 Apr 2009 09:56:29 +0200 Vitaly Mayatskikh <[email protected]>…
Quoted 1 line · Kirill A. Shutemov

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

Agree.

fs/binfmt_misc.c +1 -1
index c4e8353..f10150f 100644
@@ -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;

fs/binfmt_misc.c static int load_misc_binary(struct linux_binprm *bprm, struct pt_regs *regs) · line 120

Quoted 10 lines
fs/binfmt_misc.c +0 -2
 	int fd_binary = -1;
 
-	retval = -ENOEXEC;
 	if (!enabled)
 		goto _ret;
 
-	retval = -ENOEXEC;
 	if (bprm->recursion_depth > BINPRM_MAX_RECURSION)
 		goto _ret;
 

I don't think this is really a desirable change.

What the existing code is effectively doing is:

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

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

only it's doing this via an odd coding trick which used to (and might still) generate more efficient code.

Those two pieces of code are logically separate things and it's just by coincidence that they both happen to use the same errno.

Your proposed patch will create a linkage between those two unique pieces of code which wasn't there previously. It's a snmall thing.

Plus the compiler will surely remove one of the loads anyway, so this is purely a source-level change. And I don't think it made the source easier to read and maintain!