ecryptfs-devel team mailing list archive

Thread
Date

Re: [PATCH 1/5] eCryptfs: ecryptfs_keyring_auth_tok_for_sig() bug fix

To: Roberto Sassu <roberto.sassu@xxxxxxxxx>
From: Tyler Hicks <tyhicks@xxxxxxxxxxxxxxxxxx>
Date: Fri, 18 Mar 2011 11:02:05 -0500
Cc: keyrings@xxxxxxxxxxxxx, kirkland@xxxxxxxxxxxxx, jmorris@xxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx, dhowells@xxxxxxxxxx, ecryptfs-devel@xxxxxxxxxxxxxxxxxxx, linux-fsdevel@xxxxxxxxxxxxxxx
In-reply-to: <1300362538-11502-2-git-send-email-roberto.sassu@polito.it>
User-agent: Mutt/1.5.21 (2010-09-15)

On Thu Mar 17, 2011 at 12:48:50PM +0100, Roberto Sassu <roberto.sassu@xxxxxxxxx> wrote:
> The pointer '(*auth_tok_key)' is set to NULL in case request_key() fails,
> in order to prevent its use by functions calling
> ecryptfs_keyring_auth_tok_for_sig().

Thanks Roberto - I'm going to go ahead and merge this one into my #next
tree. Feel free to drop it from this patch set when you resend.

Tyler

> 
> Signed-off-by: Roberto Sassu <roberto.sassu@xxxxxxxxx>
> ---
>  fs/ecryptfs/keystore.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c
> index c1436cf..4feb78c 100644
> --- a/fs/ecryptfs/keystore.c
> +++ b/fs/ecryptfs/keystore.c
> @@ -1563,6 +1563,7 @@ int ecryptfs_keyring_auth_tok_for_sig(struct key **auth_tok_key,
>  		printk(KERN_ERR "Could not find key with description: [%s]\n",
>  		       sig);
>  		rc = process_request_key_err(PTR_ERR(*auth_tok_key));
> +		(*auth_tok_key) = NULL;
>  		goto out;
>  	}
>  	(*auth_tok) = ecryptfs_get_key_payload_data(*auth_tok_key);
> -- 
> 1.7.4
>