diff options
Diffstat (limited to 'security')
| -rw-r--r-- | security/capability.c | 3 | ||||
| -rw-r--r-- | security/security.c | 4 | ||||
| -rw-r--r-- | security/selinux/hooks.c | 5 | ||||
| -rw-r--r-- | security/smack/smack_lsm.c | 3 |
4 files changed, 6 insertions, 9 deletions
diff --git a/security/capability.c b/security/capability.c index 5b01c0b02422..63d10da515a5 100644 --- a/security/capability.c +++ b/security/capability.c | |||
| @@ -211,8 +211,7 @@ static int cap_inode_follow_link(struct dentry *dentry, | |||
| 211 | return 0; | 211 | return 0; |
| 212 | } | 212 | } |
| 213 | 213 | ||
| 214 | static int cap_inode_permission(struct inode *inode, int mask, | 214 | static int cap_inode_permission(struct inode *inode, int mask) |
| 215 | struct nameidata *nd) | ||
| 216 | { | 215 | { |
| 217 | return 0; | 216 | return 0; |
| 218 | } | 217 | } |
diff --git a/security/security.c b/security/security.c index 59f23b5918b3..78ed3ffde242 100644 --- a/security/security.c +++ b/security/security.c | |||
| @@ -429,11 +429,11 @@ int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd) | |||
| 429 | return security_ops->inode_follow_link(dentry, nd); | 429 | return security_ops->inode_follow_link(dentry, nd); |
| 430 | } | 430 | } |
| 431 | 431 | ||
| 432 | int security_inode_permission(struct inode *inode, int mask, struct nameidata *nd) | 432 | int security_inode_permission(struct inode *inode, int mask) |
| 433 | { | 433 | { |
| 434 | if (unlikely(IS_PRIVATE(inode))) | 434 | if (unlikely(IS_PRIVATE(inode))) |
| 435 | return 0; | 435 | return 0; |
| 436 | return security_ops->inode_permission(inode, mask, nd); | 436 | return security_ops->inode_permission(inode, mask); |
| 437 | } | 437 | } |
| 438 | 438 | ||
| 439 | int security_inode_setattr(struct dentry *dentry, struct iattr *attr) | 439 | int security_inode_setattr(struct dentry *dentry, struct iattr *attr) |
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 3481cde5bf15..5ba13908b5b4 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c | |||
| @@ -2624,12 +2624,11 @@ static int selinux_inode_follow_link(struct dentry *dentry, struct nameidata *na | |||
| 2624 | return dentry_has_perm(current, NULL, dentry, FILE__READ); | 2624 | return dentry_has_perm(current, NULL, dentry, FILE__READ); |
| 2625 | } | 2625 | } |
| 2626 | 2626 | ||
| 2627 | static int selinux_inode_permission(struct inode *inode, int mask, | 2627 | static int selinux_inode_permission(struct inode *inode, int mask) |
| 2628 | struct nameidata *nd) | ||
| 2629 | { | 2628 | { |
| 2630 | int rc; | 2629 | int rc; |
| 2631 | 2630 | ||
| 2632 | rc = secondary_ops->inode_permission(inode, mask, nd); | 2631 | rc = secondary_ops->inode_permission(inode, mask); |
| 2633 | if (rc) | 2632 | if (rc) |
| 2634 | return rc; | 2633 | return rc; |
| 2635 | 2634 | ||
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index ee5a51cbc5eb..1b40e558f983 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c | |||
| @@ -522,8 +522,7 @@ static int smack_inode_rename(struct inode *old_inode, | |||
| 522 | * | 522 | * |
| 523 | * Returns 0 if access is permitted, -EACCES otherwise | 523 | * Returns 0 if access is permitted, -EACCES otherwise |
| 524 | */ | 524 | */ |
| 525 | static int smack_inode_permission(struct inode *inode, int mask, | 525 | static int smack_inode_permission(struct inode *inode, int mask) |
| 526 | struct nameidata *nd) | ||
| 527 | { | 526 | { |
| 528 | /* | 527 | /* |
| 529 | * No permission to check. Existence test. Yup, it's there. | 528 | * No permission to check. Existence test. Yup, it's there. |
