diff --git a/[refs] b/[refs] index f55b4233f903..bf574ecf76a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5a1b63914815e4223ceb3d079286e18f9ee92b4b +refs/heads/master: 492c8b332e3af279ffadf49b85967d5e43810923 diff --git a/trunk/fs/exec.c b/trunk/fs/exec.c index 0b685888ff6f..f20561ff4528 100644 --- a/trunk/fs/exec.c +++ b/trunk/fs/exec.c @@ -134,6 +134,9 @@ asmlinkage long sys_uselib(const char __user * library) if (error) goto out; + error = -EACCES; + if (nd.mnt->mnt_flags & MNT_NOEXEC) + goto exit; error = -EINVAL; if (!S_ISREG(nd.dentry->d_inode->i_mode)) goto exit;