ecryptfs: use kasprintf in ecryptfs_crypto_api_algify_cipher_name

Use kasprintf() to simplify ecryptfs_crypto_api_algify_cipher_name().

Use const char * for the read-only cipher name and chaining modifier
while at it.

Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
Signed-off-by: Tyler Hicks <code@tyhicks.com>

diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c
index 5ef67b2674ee48204a7529487205fe63174616b6..74b02b55e3f6d0747fe5c4b7787620dfa934f79a 100644 (file)
--- a/fs/ecryptfs/crypto.c
+++ b/fs/ecryptfs/crypto.c
@@ -49,25 +49,15 @@ void ecryptfs_from_hex(char *dst, char *src, int dst_size)
 }
 
 static int ecryptfs_crypto_api_algify_cipher_name(char **algified_name,
-                                                 char *cipher_name,
-                                                 char *chaining_modifier)
+                                                 const char *cipher_name,
+                                                 const char *chaining_modifier)
 {
-       int cipher_name_len = strlen(cipher_name);
-       int chaining_modifier_len = strlen(chaining_modifier);
-       int algified_name_len;
-       int rc;
+       (*algified_name) = kasprintf(GFP_KERNEL, "%s(%s)", chaining_modifier,
+                                    cipher_name);
+       if (!(*algified_name))
+               return -ENOMEM;
 
-       algified_name_len = (chaining_modifier_len + cipher_name_len + 3);
-       (*algified_name) = kmalloc(algified_name_len, GFP_KERNEL);
-       if (!(*algified_name)) {
-               rc = -ENOMEM;
-               goto out;
-       }
-       snprintf((*algified_name), algified_name_len, "%s(%s)",
-                chaining_modifier, cipher_name);
-       rc = 0;
-out:
-       return rc;
+       return 0;
 }
 
 /**