ecryptfs-devel team mailing list archive

[Tyler Hicks <tyhicks@xxxxxxxxxxxxxxxxxx>]

On Thu Mar 17, 2011 at 12:48:51PM +0100, Roberto Sassu <roberto.sassu@xxxxxxxxx> wrote:
> The size of the 'keysig' array is incremented of one byte in order to make
> room for the NULL character.

Hello Roberto - I'm assuming that this change is because you want to
print the keysig in patch 3/5. I don't see where we are currently trying
to print the keysig, so I'll wait until you resubmit this patch set to
merge this one.

Along with what a patch does, please try to explain why it is useful in
the commit message.

Tyler

> 
> Signed-off-by: Roberto Sassu <roberto.sassu@xxxxxxxxx>
> ---
>  fs/ecryptfs/ecryptfs_kernel.h |    2 +-
>  fs/ecryptfs/keystore.c        |    1 +
>  2 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/fs/ecryptfs/ecryptfs_kernel.h b/fs/ecryptfs/ecryptfs_kernel.h
> index e007534..8282031 100644
> --- a/fs/ecryptfs/ecryptfs_kernel.h
> +++ b/fs/ecryptfs/ecryptfs_kernel.h
> @@ -233,7 +233,7 @@ ecryptfs_get_key_payload_data(struct key *key)
> 
>  struct ecryptfs_key_sig {
>  	struct list_head crypt_stat_list;
> -	char keysig[ECRYPTFS_SIG_SIZE_HEX];
> +	char keysig[ECRYPTFS_SIG_SIZE_HEX + 1];
>  };
> 
>  struct ecryptfs_filename {
> diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c
> index 4feb78c..36b68a6 100644
> --- a/fs/ecryptfs/keystore.c
> +++ b/fs/ecryptfs/keystore.c
> @@ -2425,6 +2425,7 @@ int ecryptfs_add_keysig(struct ecryptfs_crypt_stat *crypt_stat, char *sig)
>  		return -ENOMEM;
>  	}
>  	memcpy(new_key_sig->keysig, sig, ECRYPTFS_SIG_SIZE_HEX);
> +	new_key_sig->keysig[ECRYPTFS_SIG_SIZE_HEX] = '\0';
>  	/* Caller must hold keysig_list_mutex */
>  	list_add(&new_key_sig->crypt_stat_list, &crypt_stat->keysig_list);
> 
> -- 
> 1.7.4
>