|
@@ -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;
|
|
|
|
|
|
/*
|
|
/*
|