bluetooth: Properly clone LSM attributes to newly created child connections
[linux-2.6.git] / security / security.c
index 4ba6d4c..d9e1533 100644 (file)
@@ -518,14 +518,7 @@ int security_inode_permission(struct inode *inode, int mask)
 {
        if (unlikely(IS_PRIVATE(inode)))
                return 0;
-       return security_ops->inode_permission(inode, mask, 0);
-}
-
-int security_inode_exec_permission(struct inode *inode, unsigned int flags)
-{
-       if (unlikely(IS_PRIVATE(inode)))
-               return 0;
-       return security_ops->inode_permission(inode, MAY_EXEC, flags);
+       return security_ops->inode_permission(inode, mask);
 }
 
 int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
@@ -1104,6 +1097,7 @@ void security_sk_clone(const struct sock *sk, struct sock *newsk)
 {
        security_ops->sk_clone_security(sk, newsk);
 }
+EXPORT_SYMBOL(security_sk_clone);
 
 void security_sk_classify_flow(struct sock *sk, struct flowi *fl)
 {