diff options
| author | Konstantin Khlebnikov <k.khlebnikov@samsung.com> | 2014-08-07 20:52:49 +0400 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2018-01-01 20:51:48 +0000 |
| commit | c30b5944a70d35815b4baba20223eacf16ae1411 (patch) | |
| tree | 6ccebcdf832a1a74cc5c6fc4440acb3344d07307 /security | |
| parent | b92b4c8f64cc70f7f1c33df87f3b874ae0cd0652 (diff) | |
| download | linux-stable-c30b5944a70d35815b4baba20223eacf16ae1411.tar.gz linux-stable-c30b5944a70d35815b4baba20223eacf16ae1411.tar.bz2 linux-stable-c30b5944a70d35815b4baba20223eacf16ae1411.zip | |
Smack: remove unneeded NULL-termination from securtity label
commit da1b63566c469bf3e2b24182114422e16b1aa34c upstream.
Values of extended attributes are stored as binary blobs. NULL-termination
of them isn't required. It just wastes disk space and confuses command-line
tools like getfattr because they have to print that zero byte at the end.
This patch removes terminating zero byte from initial security label in
smack_inode_init_security and cuts it out in function smack_inode_getsecurity
which is used by syscall getxattr. This change seems completely safe, because
function smk_parse_smack ignores everything after first zero byte.
Signed-off-by: Konstantin Khlebnikov <k.khlebnikov@samsung.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'security')
| -rw-r--r-- | security/smack/smack_lsm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index 40cdee62097e..13d3c52bc4d4 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c @@ -674,7 +674,7 @@ static int smack_inode_init_security(struct inode *inode, struct inode *dir, } if (len) - *len = strlen(isp) + 1; + *len = strlen(isp); return 0; } @@ -1078,7 +1078,7 @@ static int smack_inode_getsecurity(const struct inode *inode, if (strcmp(name, XATTR_SMACK_SUFFIX) == 0) { isp = smk_of_inode(inode); - ilen = strlen(isp) + 1; + ilen = strlen(isp); *buffer = isp; return ilen; } @@ -1103,7 +1103,7 @@ static int smack_inode_getsecurity(const struct inode *inode, else return -EOPNOTSUPP; - ilen = strlen(isp) + 1; + ilen = strlen(isp); if (rc == 0) { *buffer = isp; rc = ilen; |