exec: Factor out alloc_bprm

Currently it is necessary for the usermode helper code and the code
that launches init to use set_fs so that pages coming from the kernel
look like they are coming from userspace.

To allow that usage of set_fs to be removed cleanly the argument
copying from userspace needs to happen earlier.  Move the allocation
of the bprm into it's own function (alloc_bprm) and move the call of
alloc_bprm before unshare_files so that bprm can ultimately be
allocated, the arguments can be placed on the new stack, and then the
bprm can be passed into the core of exec.

Neither the allocation of struct binprm nor the unsharing depend upon each
other so swapping the order in which they are called is trivially safe.

To keep things consistent the order of cleanup at the end of
do_execve_common swapped to match the order of initialization.

Reviewed-by: Kees Cook <keescook@chromium.org>
Link: https://lkml.kernel.org/r/87pn8y6x9a.fsf@x220.int.ebiederm.org
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>

diff --git a/fs/exec.c b/fs/exec.c
index 23dfbb8206264dbfac31a4f360829e83d70a7e6f..526156d6461d8403fc1df83dc7cd906899d1cf75 100644 (file)
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1560,6 +1560,14 @@ static void free_bprm(struct linux_binprm *bprm)
        kfree(bprm);
 }
 
+static struct linux_binprm *alloc_bprm(void)
+{
+       struct linux_binprm *bprm = kzalloc(sizeof(*bprm), GFP_KERNEL);
+       if (!bprm)
+               return ERR_PTR(-ENOMEM);
+       return bprm;
+}
+
 int bprm_change_interp(const char *interp, struct linux_binprm *bprm)
 {
        /* If a binfmt changed the interp, free it first. */
@@ -1848,18 +1856,19 @@ static int do_execveat_common(int fd, struct filename *filename,
         * further execve() calls fail. */
        current->flags &= ~PF_NPROC_EXCEEDED;
 
-       retval = unshare_files(&displaced);
-       if (retval)
+       bprm = alloc_bprm();
+       if (IS_ERR(bprm)) {
+               retval = PTR_ERR(bprm);
                goto out_ret;
+       }
 
-       retval = -ENOMEM;
-       bprm = kzalloc(sizeof(*bprm), GFP_KERNEL);
-       if (!bprm)
-               goto out_files;
+       retval = unshare_files(&displaced);
+       if (retval)
+               goto out_free;
 
        retval = prepare_bprm_creds(bprm);
        if (retval)
-               goto out_free;
+               goto out_files;
 
        check_unsafe_exec(bprm);
        current->in_execve = 1;
@@ -1956,13 +1965,13 @@ out_unmark:
        current->fs->in_exec = 0;
        current->in_execve = 0;
 
+out_files:
+       if (displaced)
+               reset_files_struct(displaced);
 out_free:
        free_bprm(bprm);
        kfree(pathbuf);
 
-out_files:
-       if (displaced)
-               reset_files_struct(displaced);
 out_ret:
        putname(filename);
        return retval;