diff options
Diffstat (limited to 'security/smack/smack_lsm.c')
-rw-r--r-- | security/smack/smack_lsm.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index 9831a39c11f..b9c5e149903 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c | |||
@@ -9,7 +9,7 @@ | |||
9 | * | 9 | * |
10 | * Copyright (C) 2007 Casey Schaufler <casey@schaufler-ca.com> | 10 | * Copyright (C) 2007 Casey Schaufler <casey@schaufler-ca.com> |
11 | * Copyright (C) 2009 Hewlett-Packard Development Company, L.P. | 11 | * Copyright (C) 2009 Hewlett-Packard Development Company, L.P. |
12 | * Paul Moore <paul.moore@hp.com> | 12 | * Paul Moore <paul@paul-moore.com> |
13 | * Copyright (C) 2010 Nokia Corporation | 13 | * Copyright (C) 2010 Nokia Corporation |
14 | * | 14 | * |
15 | * This program is free software; you can redistribute it and/or modify | 15 | * This program is free software; you can redistribute it and/or modify |
@@ -689,9 +689,10 @@ static int smack_inode_rename(struct inode *old_inode, | |||
689 | * | 689 | * |
690 | * Returns 0 if access is permitted, -EACCES otherwise | 690 | * Returns 0 if access is permitted, -EACCES otherwise |
691 | */ | 691 | */ |
692 | static int smack_inode_permission(struct inode *inode, int mask, unsigned flags) | 692 | static int smack_inode_permission(struct inode *inode, int mask) |
693 | { | 693 | { |
694 | struct smk_audit_info ad; | 694 | struct smk_audit_info ad; |
695 | int no_block = mask & MAY_NOT_BLOCK; | ||
695 | 696 | ||
696 | mask &= (MAY_READ|MAY_WRITE|MAY_EXEC|MAY_APPEND); | 697 | mask &= (MAY_READ|MAY_WRITE|MAY_EXEC|MAY_APPEND); |
697 | /* | 698 | /* |
@@ -701,7 +702,7 @@ static int smack_inode_permission(struct inode *inode, int mask, unsigned flags) | |||
701 | return 0; | 702 | return 0; |
702 | 703 | ||
703 | /* May be droppable after audit */ | 704 | /* May be droppable after audit */ |
704 | if (flags & IPERM_FLAG_RCU) | 705 | if (no_block) |
705 | return -ECHILD; | 706 | return -ECHILD; |
706 | smk_ad_init(&ad, __func__, LSM_AUDIT_DATA_INODE); | 707 | smk_ad_init(&ad, __func__, LSM_AUDIT_DATA_INODE); |
707 | smk_ad_setfield_u_fs_inode(&ad, inode); | 708 | smk_ad_setfield_u_fs_inode(&ad, inode); |