From f41a39ec4cf0295b9acb0443137269e6693d6718 Mon Sep 17 00:00:00 2001 From: Tyler Hicks Date: Fri, 6 Feb 2009 18:06:51 -0600 Subject: [PATCH] --- yaml --- r: 131031 b: refs/heads/master c: fd9fc842bbab0cb5560b0d52ce4598c898707863 h: refs/heads/master i: 131029: 76695f9eb8c545800d86eb747f5da0c9a79449e5 131027: 940a8716ae542611f4307a037cf4d81d2b5ffe42 131023: 4ab93a4553c5899a340dcc549ac987052493c83f v: v3 --- [refs] | 2 +- trunk/fs/ecryptfs/crypto.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e0aada9203dc..2010602ae28f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eeb94855beeb7fde5f9e2ed72fe6a8b24cd5a3c7 +refs/heads/master: fd9fc842bbab0cb5560b0d52ce4598c898707863 diff --git a/trunk/fs/ecryptfs/crypto.c b/trunk/fs/ecryptfs/crypto.c index c01e043670e2..f6caeb1d1106 100644 --- a/trunk/fs/ecryptfs/crypto.c +++ b/trunk/fs/ecryptfs/crypto.c @@ -1716,7 +1716,7 @@ static int ecryptfs_copy_filename(char **copied_name, size_t *copied_name_size, { int rc = 0; - (*copied_name) = kmalloc((name_size + 2), GFP_KERNEL); + (*copied_name) = kmalloc((name_size + 1), GFP_KERNEL); if (!(*copied_name)) { rc = -ENOMEM; goto out; @@ -1726,7 +1726,7 @@ static int ecryptfs_copy_filename(char **copied_name, size_t *copied_name_size, * in printing out the * string in debug * messages */ - (*copied_name_size) = (name_size + 1); + (*copied_name_size) = name_size; out: return rc; }