exec: fix set_binfmt() vs sys_delete_module() race

[mv-sheeva.git] / fs / exec.c

diff --git a/fs/exec.c b/fs/exec.c
index 8efbdc606a1e9be84eff1dc72872a7f49d8545db..6dc92c39dd944d5493fffc3890862352d7672d27 100644 (file)
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1395,18 +1395,14 @@ out_ret:
        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);