Merge branch 'ehci-omap-clock' into omap-fixes

1 files changed, 9 insertions, 0 deletions

diff --git a/security/security.c b/security/security.c
index e5fb07a3052d..739e40362f44 100644
--- a/security/security.c
+++ b/security/security.c
@@ -513,6 +513,15 @@ int security_inode_permission(struct inode *inode, int mask)
         return security_ops->inode_permission(inode, mask);
 }
 
+int security_inode_exec_permission(struct inode *inode, unsigned int flags)
+{
+        if (unlikely(IS_PRIVATE(inode)))
+                return 0;
+        if (flags)
+                return -ECHILD;
+        return security_ops->inode_permission(inode, MAY_EXEC);
+}
+
 int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
 {
         if (unlikely(IS_PRIVATE(dentry->d_inode)))