[linux-cifs-client] Re: [PATCH] Adds uid to key description fro supporting user mounts [fixed]

[Jeff Layton]

On Thu, 08 Nov 2007 17:23:12 +0300
"Q (Igor Mammedov)" <qwerty0987654321 at mail.ru> wrote:

> From 664fb1b1efdefbaf5e2deafdc174099d1d9df5f9 Mon Sep 17 00:00:00 2001
> Adds uid to key description fro supporting user mounts
> and minor formating changes
> Signed-off-by: Igor Mammedov <niallain at gmail.com>

Looks reasonable -- ACK.

> ---
>  fs/cifs/cifs_spnego.c |   12 ++++++++----
>  1 files changed, 8 insertions(+), 4 deletions(-)
> 
> diff --git a/fs/cifs/cifs_spnego.c b/fs/cifs/cifs_spnego.c
> index e142faf..189b629 100644
> --- a/fs/cifs/cifs_spnego.c
> +++ b/fs/cifs/cifs_spnego.c
> @@ -76,9 +76,10 @@ cifs_get_spnego_key(struct cifsSesInfo *sesInfo,
> const char *hostname) struct key *spnego_key;
>  
>  
> -	/* version + ;ip{4|6}= + address + ;host=hostname + ;sec= +
> NULL */
> -	desc_len = 2 + 5 + 32 + 1 + 5 + strlen(hostname) +
> -		   strlen(";sec=krb5") + 1;
> +	/* version + ;ip{4|6}= + address + ;host=hostname +
> +		;sec= + ;uid= + NULL */
> +	desc_len = 4 + 5 + 32 + 1 + 5 + strlen(hostname) +
> +		   strlen(";sec=krb5") + 7 + sizeof(uid_t)*2 + 1;
>  	spnego_key = ERR_PTR(-ENOMEM);
>  	description = kzalloc(desc_len, GFP_KERNEL);
>  	if (description == NULL)
> @@ -87,7 +88,7 @@ cifs_get_spnego_key(struct cifsSesInfo *sesInfo,
> const char *hostname) dp = description;
>  	/* start with version and hostname portion of UNC string */
>  	spnego_key = ERR_PTR(-EINVAL);
> -	sprintf(dp, "%2.2x;host=%s;", CIFS_SPNEGO_UPCALL_VERSION,
> +	sprintf(dp, "0x%2.2x;host=%s;", CIFS_SPNEGO_UPCALL_VERSION,
>  		hostname);
>  	dp = description + strlen(description);
>  
> @@ -109,6 +110,9 @@ cifs_get_spnego_key(struct cifsSesInfo *sesInfo,
> const char *hostname) else
>  		goto out;
>  
> +	dp = description + strlen(description);
> +	sprintf(dp, ";uid=0x%x", sesInfo->linux_uid );
> +
>  	cFYI(1, ("key description = %s", description));
>  	spnego_key = request_key(&cifs_spnego_key_type, description,
> ""); 


-- 
Jeff Layton <jlayton at redhat.com>