exec: Move bprm_mm_init into alloc_bprm

[sfrench/cifs-2.6.git] / fs / exec.c

diff --git a/fs/exec.c b/fs/exec.c
index 7e8af27dd199af102a61e050851b61d7535e052b..afb168bf5e233dd904b263ca2c82a5c398046583 100644 (file)
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1543,6 +1543,10 @@ static int prepare_bprm_creds(struct linux_binprm *bprm)
 
 static void free_bprm(struct linux_binprm *bprm)
 {
 
 static void free_bprm(struct linux_binprm *bprm)
 {

+       if (bprm->mm) {
+               acct_arg_size(bprm, 0);
+               mmput(bprm->mm);
+       }

        free_arg_pages(bprm);
        if (bprm->cred) {
                mutex_unlock(&current->signal->cred_guard_mutex);
        free_arg_pages(bprm);
        if (bprm->cred) {
                mutex_unlock(&current->signal->cred_guard_mutex);


@@ -1582,6 +1586,10 @@ static struct linux_binprm *alloc_bprm(int fd, struct filename *filename)
                bprm->filename = bprm->fdpath;
        }
        bprm->interp = bprm->filename;
                bprm->filename = bprm->fdpath;
        }
        bprm->interp = bprm->filename;

+
+       retval = bprm_mm_init(bprm);
+       if (retval)
+               goto out_free;

        return bprm;
 
 out_free:
        return bprm;
 
 out_free:


@@ -1911,10 +1919,6 @@ static int do_execveat_common(int fd, struct filename *filename,
            close_on_exec(fd, rcu_dereference_raw(current->files->fdt)))
                bprm->interp_flags |= BINPRM_FLAGS_PATH_INACCESSIBLE;
 
            close_on_exec(fd, rcu_dereference_raw(current->files->fdt)))
                bprm->interp_flags |= BINPRM_FLAGS_PATH_INACCESSIBLE;
 

-       retval = bprm_mm_init(bprm);
-       if (retval)
-               goto out_unmark;
-

        retval = prepare_arg_pages(bprm, argv, envp);
        if (retval < 0)
                goto out;
        retval = prepare_arg_pages(bprm, argv, envp);
        if (retval < 0)
                goto out;


@@ -1962,10 +1966,6 @@ out:
         */
        if (bprm->point_of_no_return && !fatal_signal_pending(current))
                force_sigsegv(SIGSEGV);
         */
        if (bprm->point_of_no_return && !fatal_signal_pending(current))
                force_sigsegv(SIGSEGV);

-       if (bprm->mm) {
-               acct_arg_size(bprm, 0);
-               mmput(bprm->mm);
-       }

 
 out_unmark:
        current->fs->in_exec = 0;
 
 out_unmark:
        current->fs->in_exec = 0;