Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62f2730a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of... 

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  Smack: check for SMACK xattr validity in smack_inode_setxattr
parents 4af94f39 defc433b

security/smack/smack_lsm.c

+6 −5
Original line number Diff line number Diff line
@@ -609,8 +609,12 @@ static int smack_inode_setxattr(struct dentry *dentry, const char *name, 
	    strcmp(name, XATTR_NAME_SMACKIPOUT) == 0) {

		if (!capable(CAP_MAC_ADMIN))

			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;

	} else

		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))

		return;



	if (size >= SMK_LABELLEN)

		return;



	isp = dentry->d_inode->i_security;



	/*