Messages in this thread Patch in this message |  | | Subject | [patch] ecryptfs: string copy cleanup | From | Miklos Szeredi <> | Date | Mon, 16 Jun 2008 13:14:28 +0200 |
| |
From: Miklos Szeredi <mszeredi@suse.cz>
Clean up overcomplicated string copy, which also gets rid of this bogus warning:
fs/ecryptfs/main.c: In function 'ecryptfs_parse_options': include/asm/arch/string_32.h:75: warning: array subscript is above array bounds
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz> --- fs/ecryptfs/main.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-)
Index: linux-2.6/fs/ecryptfs/main.c =================================================================== --- linux-2.6.orig/fs/ecryptfs/main.c 2008-06-09 14:14:27.000000000 +0200 +++ linux-2.6/fs/ecryptfs/main.c 2008-06-13 13:04:04.000000000 +0200 @@ -314,7 +314,6 @@ static int ecryptfs_parse_options(struct char *cipher_name_dst; char *cipher_name_src; char *cipher_key_bytes_src; - int cipher_name_len; if (!options) { rc = -EINVAL; @@ -395,17 +394,12 @@ static int ecryptfs_parse_options(struct goto out; } if (!cipher_name_set) { - cipher_name_len = strlen(ECRYPTFS_DEFAULT_CIPHER); - if (unlikely(cipher_name_len - >= ECRYPTFS_MAX_CIPHER_NAME_SIZE)) { - rc = -EINVAL; - BUG(); - goto out; - } - memcpy(mount_crypt_stat->global_default_cipher_name, - ECRYPTFS_DEFAULT_CIPHER, cipher_name_len); - mount_crypt_stat->global_default_cipher_name[cipher_name_len] - = '\0'; + int cipher_name_len = strlen(ECRYPTFS_DEFAULT_CIPHER); + + BUG_ON(cipher_name_len >= ECRYPTFS_MAX_CIPHER_NAME_SIZE); + + strcpy(mount_crypt_stat->global_default_cipher_name, + ECRYPTFS_DEFAULT_CIPHER); } if (!cipher_key_bytes_set) { mount_crypt_stat->global_default_cipher_key_size = 0;
|  |