2 files changed, 15 insertions, 15 deletions

diff --git a/fs/compat.c b/fs/compat.c
index 379a399bf5c3..681ed81e6be0 100644
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -1476,6 +1476,7 @@ int compat_do_execve(char * filename,
         struct linux_binprm *bprm;
         struct file *file;
         struct files_struct *displaced;
+        bool clear_in_exec;
         int retval;
 
         retval = unshare_files(&displaced);
@@ -1498,8 +1499,9 @@ int compat_do_execve(char * filename,
                 goto out_unlock;
 
         retval = check_unsafe_exec(bprm);
-        if (retval)
+        if (retval < 0)
                 goto out_unlock;
+        clear_in_exec = retval;
 
         file = open_exec(filename);
         retval = PTR_ERR(file);
@@ -1546,9 +1548,7 @@ int compat_do_execve(char * filename,
                 goto out;
 
         /* execve succeeded */
-        write_lock(&current->fs->lock);
         current->fs->in_exec = 0;
-        write_unlock(&current->fs->lock);
         current->in_execve = 0;
         mutex_unlock(&current->cred_exec_mutex);
         acct_update_integrals(current);
@@ -1568,9 +1568,8 @@ out_file:
         }
 
 out_unmark:
-        write_lock(&current->fs->lock);
-        current->fs->in_exec = 0;
-        write_unlock(&current->fs->lock);
+        if (clear_in_exec)
+                current->fs->in_exec = 0;
 
 out_unlock:
         current->in_execve = 0;
diff --git a/fs/exec.c b/fs/exec.c
index 052a961e41aa..a2e6989dbc3a 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1077,9 +1077,11 @@ int check_unsafe_exec(struct linux_binprm *bprm)
         if (p->fs->users > n_fs) {
                 bprm->unsafe |= LSM_UNSAFE_SHARE;
         } else {
-                if (p->fs->in_exec)
-                        res = -EAGAIN;
-                p->fs->in_exec = 1;
+                res = -EAGAIN;
+                if (!p->fs->in_exec) {
+                        p->fs->in_exec = 1;
+                        res = 1;
+                }
         }
 
         unlock_task_sighand(p, &flags);
@@ -1284,6 +1286,7 @@ int do_execve(char * filename,
         struct linux_binprm *bprm;
         struct file *file;
         struct files_struct *displaced;
+        bool clear_in_exec;
         int retval;
 
         retval = unshare_files(&displaced);
@@ -1306,8 +1309,9 @@ int do_execve(char * filename,
                 goto out_unlock;
 
         retval = check_unsafe_exec(bprm);
-        if (retval)
+        if (retval < 0)
                 goto out_unlock;
+        clear_in_exec = retval;
 
         file = open_exec(filename);
         retval = PTR_ERR(file);
@@ -1355,9 +1359,7 @@ int do_execve(char * filename,
                 goto out;
 
         /* execve succeeded */
-        write_lock(&current->fs->lock);
         current->fs->in_exec = 0;
-        write_unlock(&current->fs->lock);
         current->in_execve = 0;
         mutex_unlock(&current->cred_exec_mutex);
         acct_update_integrals(current);
@@ -1377,9 +1379,8 @@ out_file:
         }
 
 out_unmark:
-        write_lock(&current->fs->lock);
-        current->fs->in_exec = 0;
-        write_unlock(&current->fs->lock);
+        if (clear_in_exec)
+                current->fs->in_exec = 0;
 
 out_unlock:
         current->in_execve = 0;