Message-ID: <49E7FC03.20605@schaufler-ca.com>
Date: Thu, 16 Apr 2009 20:48:19 -0700
From: Casey Schaufler <casey@schaufler-ca.com>
User-Agent: Thunderbird 2.0.0.21 (Windows/20090302)
MIME-Version: 1.0
To: Etienne Basset <etienne.basset@numericable.fr>
CC: LSM <linux-security-module@vger.kernel.org>,
       Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] Smack: check for SMACK xattr validity in smack_inode_setxattr
References: <49E4D5B6.80202@numericable.fr> <49E561C8.90306@schaufler-ca.com> <49E57DFF.9030207@numericable.fr> <49E60B2D.5080508@schaufler-ca.com> <49E7AA12.2090406@numericable.fr>
In-Reply-To: <49E7AA12.2090406@numericable.fr>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1631
Lines: 50

Etienne Basset wrote:
> 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>

> ---
> diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
> index 9215149..98b3195 100644
> --- a/security/smack/smack_lsm.c
> +++ b/security/smack/smack_lsm.c
> @@ -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;
>  
>  	/*
>
>
>
>   

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/