From b77355d5779410f4d9a42a292743a5e12605f29a Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Wed, 23 May 2007 13:57:53 -0700
Subject: [PATCH] --- yaml --- r: 56893 b: refs/heads/master c:
 492c8b332e3af279ffadf49b85967d5e43810923 h: refs/heads/master i:   56891:
 743bc61c85c9202119c8a1b0e5fbabff0715259f v: v3

---
 [refs]          | 2 +-
 trunk/fs/exec.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

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;