Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8862906 authored by Eric Sandeen's avatar Eric Sandeen Committed by Linus Torvalds
Browse files

ecryptfs: fix string overflow on long cipher names 



Passing a cipher name > 32 chars on mount results in an overflow when the
cipher name is printed, because the last character in the struct
ecryptfs_key_tfm's cipher_name string was never zeroed.

Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
Acked-by: default avatarMichael Halcrow <mhalcrow@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ed367fc3

fs/ecryptfs/crypto.c

+1 −0
Original line number Diff line number Diff line
@@ -1847,6 +1847,7 @@ ecryptfs_add_new_key_tfm(struct ecryptfs_key_tfm **key_tfm, char *cipher_name, 
	mutex_init(&tmp_tfm->key_tfm_mutex);

	strncpy(tmp_tfm->cipher_name, cipher_name,

		ECRYPTFS_MAX_CIPHER_NAME_SIZE);

	tmp_tfm->cipher_name[ECRYPTFS_MAX_CIPHER_NAME_SIZE] = '\0';

	tmp_tfm->key_size = key_size;

	rc = ecryptfs_process_key_cipher(&tmp_tfm->key_tfm,

					 tmp_tfm->cipher_name,