Commit:     b88629060b03adc58639f818fe0968bf5fe81b5d
Parent:     ed367fc3a7349b17354c7acef551533337764859
Author:     Eric Sandeen <[EMAIL PROTECTED]>
AuthorDate: Sat Dec 22 14:03:24 2007 -0800
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Sun Dec 23 12:54:36 2007 -0800

    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: Eric Sandeen <[EMAIL PROTECTED]>
    Acked-by: Michael Halcrow <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 fs/ecryptfs/crypto.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c
index bbed2fd..67e8b16 100644
--- a/fs/ecryptfs/crypto.c
+++ b/fs/ecryptfs/crypto.c
@@ -1847,6 +1847,7 @@ ecryptfs_add_new_key_tfm(struct ecryptfs_key_tfm 
**key_tfm, char *cipher_name,
        strncpy(tmp_tfm->cipher_name, cipher_name,
+       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,
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to