summaryrefslogtreecommitdiff
path: root/security/smack/smack_access.c
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2013-04-02 01:45:36 +1100
committerJames Morris <james.l.morris@oracle.com>2013-04-02 01:45:36 +1100
commit9b0271d8ca4d99becbf9ca1871c0d0faa5fad676 (patch)
treee23f854c68dd553633b93ef4556607b1a143feaa /security/smack/smack_access.c
parentd13274794ad28d90ac81643d3d1d18338d948764 (diff)
parentcdb56b60884c687ea396ae96a418554739b40129 (diff)
downloadolio-linux-3.10-9b0271d8ca4d99becbf9ca1871c0d0faa5fad676.tar.xz
olio-linux-3.10-9b0271d8ca4d99becbf9ca1871c0d0faa5fad676.zip
Merge branch 'stage-for-3.10' of git://git.gitorious.org/smack-next/kernel into ra-next
Diffstat (limited to 'security/smack/smack_access.c')
-rw-r--r--security/smack/smack_access.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/security/smack/smack_access.c b/security/smack/smack_access.c
index db14689a21e..2e397a88d41 100644
--- a/security/smack/smack_access.c
+++ b/security/smack/smack_access.c
@@ -252,6 +252,8 @@ static inline void smack_str_from_perm(char *string, int access)
string[i++] = 'x';
if (access & MAY_APPEND)
string[i++] = 'a';
+ if (access & MAY_TRANSMUTE)
+ string[i++] = 't';
string[i] = '\0';
}
/**