luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Smack: check for SMACK xattr validity in smack_inode_setxattr

Browse Source 
the following patch moves checks for SMACK xattr validity
from smack_inode_post_setxattr (which cannot return an error to the user)
to smack_inode_setxattr (which can return an error).

Signed-off-by: Etienne Basset <etienne.basset@numericable.fr>
Acked-by: Casey Schaufler <casey@schaufler-ca.com>
Signed-off-by: James Morris <jmorris@namei.org>
This commit is contained in:
Etienne Basset 2009-04-16 23:58:42 +02:00 committed by James Morris
parent aefe647572
commit defc433ba3
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
security/smack/smack_lsm.c
View File

@ -609,8 +609,12 @@ static int smack_inode_setxattr(struct dentry *dentry, const char *name,
strcmp(name, XATTR_NAME_SMACKIPOUT) == 0) { strcmp(name, XATTR_NAME_SMACKIPOUT) == 0) {
if (!capable(CAP_MAC_ADMIN)) if (!capable(CAP_MAC_ADMIN))
rc = -EPERM; rc = -EPERM;
/* a label cannot be void and cannot begin with '-' */ /*
if (size == 0 || (size > 0 && ((char *)value)[0] == '-')) * check label validity here so import wont fail on
* post_setxattr
*/
if (size == 0 || size >= SMK_LABELLEN ||
smk_import(value, size) == NULL)
rc = -EINVAL; rc = -EINVAL;
} else } else
rc = cap_inode_setxattr(dentry, name, value, size, flags); rc = cap_inode_setxattr(dentry, name, value, size, flags);
@ -644,9 +648,6 @@ static void smack_inode_post_setxattr(struct dentry *dentry, const char *name,
if (strcmp(name, XATTR_NAME_SMACK)) if (strcmp(name, XATTR_NAME_SMACK))
return; return;
if (size >= SMK_LABELLEN)
return;
isp = dentry->d_inode->i_security; isp = dentry->d_inode->i_security;
/* /*