From: Konstantin Khlebnikov Date: Thu, 7 Aug 2014 16:52:49 +0000 (+0400) Subject: Smack: remove unneeded NULL-termination from securtity label X-Git-Tag: accepted/tizen/common/20150204.141923~19 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=76cd3ed66c52833c12f8cab52a490b8f0cd0d5e3;p=profile%2Fcommon%2Fkernel-common.git Smack: remove unneeded NULL-termination from securtity label 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. Change-Id: I131879e36fc9e71b65857b46714ccd0e512fc83c Signed-off-by: Konstantin Khlebnikov Signed-off-by: Rafal Krypa --- diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index 7bd0363..d347b79 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c @@ -672,7 +672,7 @@ static int smack_inode_init_security(struct inode *inode, struct inode *dir, } if (len) - *len = strlen(isp) + 1; + *len = strlen(isp); return 0; } @@ -1076,7 +1076,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; } @@ -1101,7 +1101,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;