1 files changed, 3 insertions, 0 deletions

diff --git a/fs/exec.c b/fs/exec.c
index f20561ff4528..2e3f7950c185 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1154,6 +1154,7 @@ int do_execve(char * filename,
 {
         struct linux_binprm *bprm;
         struct file *file;
+        unsigned long env_p;
         int retval;
         int i;
 
@@ -1208,9 +1209,11 @@ int do_execve(char * filename,
         if (retval < 0)
                 goto out;
 
+        env_p = bprm->p;
         retval = copy_strings(bprm->argc, argv, bprm);
         if (retval < 0)
                 goto out;
+        bprm->argv_len = env_p - bprm->p;
 
         retval = search_binary_handler(bprm,regs);
         if (retval >= 0) {