UBUNTU: Ubuntu-4.13.0-45.50

[mirror_ubuntu-artful-kernel.git] / fs / exec.c

diff --git a/fs/exec.c b/fs/exec.c
index a5d3d2b4faea6220865166f685ed0d41e9e1938d..0f47bb84860c3a79e7c4fe0f4425459b665cff13 100644 (file)
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -62,6 +62,7 @@
 #include <linux/oom.h>
 #include <linux/compat.h>
 #include <linux/vmalloc.h>
+#include <linux/delay.h>
 
 #include <trace/events/fs.h>
 
@@ -111,6 +112,7 @@ bool path_noexec(const struct path *path)
        return (path->mnt->mnt_flags & MNT_NOEXEC) ||
               (path->mnt->mnt_sb->s_iflags & SB_I_NOEXEC);
 }
+EXPORT_SYMBOL_GPL(path_noexec);
 
 bool path_nosuid(const struct path *path)
 {
@@ -1464,6 +1466,7 @@ static void check_unsafe_exec(struct linux_binprm *bprm)
        struct task_struct *p = current, *t;
        unsigned n_fs;
        bool fs_recheck;
+       int count = 0;
 
        if (p->ptrace)
                bprm->unsafe |= LSM_UNSAFE_PTRACE;
@@ -1491,8 +1494,11 @@ recheck:
 
        if (p->fs->users > n_fs) {
                if (fs_recheck) {
-                       spin_unlock(&p->fs->lock);
-                       goto recheck;
+                       if (count++ < 20) {
+                               spin_unlock(&p->fs->lock);
+                               msleep_interruptible(1);
+                               goto recheck;
+                       }
                }
                bprm->unsafe |= LSM_UNSAFE_SHARE;
        } else