ecryptfs-devel team mailing list archive

[Casey Schaufler <casey@xxxxxxxxxxxxxxxx>]

On 4/27/2011 5:34 AM, Roberto Sassu wrote:
> The security label passed as argument in smack_secctx_to_secid() must be
> first imported in the 'smack_known_list' list before finding the security
> identifier associated to it. This allows the function
> set_security_override_from_ctx() to be performed successfully even if the
> label is not yet present in the smack list.
>
> Signed-off-by: Roberto Sassu <roberto.sassu@xxxxxxxxx>

Nacked-by: Casey Schaufler <casey@xxxxxxxxxxxxxxxx>

security_secctx_to_secid() is called from the netlabel code
and hence cannot (to my understanding) allocate memory,
which is something that smk_import will do if the label is
new. I am willing to be convinced that doing so is safe,
but my understanding is that it is not.

> ---
>  security/smack/smack_lsm.c |    8 +++++++-
>  1 files changed, 7 insertions(+), 1 deletions(-)
>
> diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
> index 0e7ed31..6612ba1 100644
> --- a/security/smack/smack_lsm.c
> +++ b/security/smack/smack_lsm.c
> @@ -3346,7 +3346,13 @@ static int smack_secid_to_secctx(u32 secid, char **secdata, u32 *seclen)
>   */
>  static int smack_secctx_to_secid(const char *secdata, u32 seclen, u32 *secid)
>  {
> -	*secid = smack_to_secid(secdata);
> +	char *smack;
> +
> +	smack = smk_import(secdata, seclen);
> +	if (smack == NULL)
> +		return -EINVAL;
> +
> +	*secid = smack_to_secid(smack);
>  	return 0;
>  }
>