eCryptfs: Regression in unencrypted filename symlinks
PATCH 1/1 eCryptfs: Regression in unencrypted filename symlinks
The addition of filename encryption caused a regression in unencrypted filename symlink support. ecryptfs_copy_filename() is used when dealing with unencrypted filenames and it reported that the new, copied filename was a character longer than it should have been.
This caused the return value of readlink() to count the NULL byte of the symlink target. Most applications don't care about the extra NULL byte, but a version control system (bzr) helped in discovering the bug.
--- fs/ecryptfs/crypto.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
fs/ecryptfs/crypto.c +2 -2
@@ -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; }
Signature · 1 line
1.5.3.7
Quoted 10 lines · Tyler Hicks
The addition of filename encryption caused a regression in unencrypted filename symlink support.
ecryptfs_copy_filename()is used when dealing with unencrypted filenames and it reported that the new, copied filename was a character longer than it should have been.This caused the return value of
readlink()to count the NULL byte of the symlink target. Most applications don't care about the extra NULL byte, but a version control system (bzr) helped in discovering the bug.Signed-off-by Tyler Hicks <[email protected]>
Quoted 26 lines
--- fs/ecryptfs/crypto.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)fs/ecryptfs/crypto.c +2
-2@@ -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; }
Signature · 2 lines
David Kleikamp IBM Linux Technology Center