Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
  [PATCH] return to old errno choice in mkdir() et.al.
  [Patch] fs/binfmt_elf.c: fix wrong return values
  [PATCH] get rid of leak in compat_execve()
  [Patch] fs/binfmt_elf.c: fix a wrong free
  [PATCH] avoid multiplication overflows and signedness issues for max_fds
  [PATCH] dup_fd() part 4 - race fix
  [PATCH] dup_fd() - part 3
  [PATCH] dup_fd() part 2
  [PATCH] dup_fd() fixes, part 1
  [PATCH] take init_files to fs/file.c

1 files changed, 8 insertions, 4 deletions

diff --git a/fs/exec.c b/fs/exec.c
index 1f8a24aa1f8b..3c2ba7ce11d4 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1251,6 +1251,12 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs)
 
 EXPORT_SYMBOL(search_binary_handler);
 
+void free_bprm(struct linux_binprm *bprm)
+{
+        free_arg_pages(bprm);
+        kfree(bprm);
+}
+
 /*
  * sys_execve() executes a new program.
  */
@@ -1320,17 +1326,15 @@ int do_execve(char * filename,
         retval = search_binary_handler(bprm,regs);
         if (retval >= 0) {
                 /* execve success */
-                free_arg_pages(bprm);
                 security_bprm_free(bprm);
                 acct_update_integrals(current);
-                kfree(bprm);
+                free_bprm(bprm);
                 if (displaced)
                         put_files_struct(displaced);
                 return retval;
         }
 
 out:
-        free_arg_pages(bprm);
         if (bprm->security)
                 security_bprm_free(bprm);
 
@@ -1344,7 +1348,7 @@ out_file:
                 fput(bprm->file);
         }
 out_kfree:
-        kfree(bprm);
+        free_bprm(bprm);
 
 out_files:
         if (displaced)