---

yaml --- r: 165685 b: refs/heads/master c: 964ee7d h: refs/heads/master i: 165683: b97ae8e v: v3
git-mirror · Sep 24, 2009 · b6f1ef8 · b6f1ef8
1 parent 25fba1b
commit b6f1ef8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61be228a06dc6e8662f30e89eda3c12083c1f379
+refs/heads/master: 964ee7df90d799e38fb1556c57cd5c45fc736436
diff --git a/trunk/fs/exec.c b/trunk/fs/exec.c
@@ -1395,18 +1395,14 @@ int do_execve(char * filename,
 	return retval;
 }
 
-int set_binfmt(struct linux_binfmt *new)
+void set_binfmt(struct linux_binfmt *new)
 {
-	struct linux_binfmt *old = current->binfmt;
+	if (current->binfmt)
+		module_put(current->binfmt->module);
 
-	if (new) {
-		if (!try_module_get(new->module))
-			return -1;
-	}
 	current->binfmt = new;
-	if (old)
-		module_put(old->module);
-	return 0;
+	if (new)
+		__module_get(new->module);
 }
 
 EXPORT_SYMBOL(set_binfmt);

diff --git a/trunk/include/linux/binfmts.h b/trunk/include/linux/binfmts.h
@@ -120,7 +120,7 @@ extern int copy_strings_kernel(int argc,char ** argv,struct linux_binprm *bprm);
 extern int prepare_bprm_creds(struct linux_binprm *bprm);
 extern void install_exec_creds(struct linux_binprm *bprm);
 extern void do_coredump(long signr, int exit_code, struct pt_regs *regs);
-extern int set_binfmt(struct linux_binfmt *new);
+extern void set_binfmt(struct linux_binfmt *new);
 extern void free_bprm(struct linux_binprm *);
 
 #endif /* __KERNEL__ */