Commit fb1b02dc authored by Thorsten Blum's avatar Thorsten Blum Committed by Tyler Hicks
Browse files

ecryptfs: Remove redundant if checks in encrypt_and_encode_filename 



The outer if already checks if 'mount_crypt_stat' is true. Drop checking
'mount_crypt_stat' again.  Use ecryptfs_printk() while we're at it.

Signed-off-by: default avatarThorsten Blum <thorsten.blum@linux.dev>
Signed-off-by: default avatarTyler Hicks <code@tyhicks.com>
parent 3b7f363b

fs/ecryptfs/crypto.c

+10 −11
Original line number Diff line number Diff line
@@ -1802,8 +1802,9 @@ int ecryptfs_encrypt_and_encode_filename( 
		filename->filename_size = name_size;

		rc = ecryptfs_encrypt_filename(filename, mount_crypt_stat);

		if (rc) {

			printk(KERN_ERR "%s: Error attempting to encrypt "

			       "filename; rc = [%d]\n", __func__, rc);

			ecryptfs_printk(KERN_ERR,

				"Error attempting to encrypt filename; rc = [%d]\n",

				rc);

			kfree(filename);

			goto out;

		}
@@ -1811,9 +1812,8 @@ int ecryptfs_encrypt_and_encode_filename( 
			NULL, &encoded_name_no_prefix_size,

			filename->encrypted_filename,

			filename->encrypted_filename_size);

		if (mount_crypt_stat

			&& (mount_crypt_stat->flags

			    & ECRYPTFS_GLOBAL_ENCFN_USE_MOUNT_FNEK))

		if (mount_crypt_stat->flags

		    & ECRYPTFS_GLOBAL_ENCFN_USE_MOUNT_FNEK)

			(*encoded_name_size) =

				(ECRYPTFS_FNEK_ENCRYPTED_FILENAME_PREFIX_SIZE

				 + encoded_name_no_prefix_size);
@@ -1828,9 +1828,8 @@ int ecryptfs_encrypt_and_encode_filename( 
			kfree(filename);

			goto out;

		}

		if (mount_crypt_stat

			&& (mount_crypt_stat->flags

			    & ECRYPTFS_GLOBAL_ENCFN_USE_MOUNT_FNEK)) {

		if (mount_crypt_stat->flags

		    & ECRYPTFS_GLOBAL_ENCFN_USE_MOUNT_FNEK) {

			memcpy((*encoded_name),

			       ECRYPTFS_FNEK_ENCRYPTED_FILENAME_PREFIX,

			       ECRYPTFS_FNEK_ENCRYPTED_FILENAME_PREFIX_SIZE);
@@ -1848,8 +1847,8 @@ int ecryptfs_encrypt_and_encode_filename( 
			rc = -EOPNOTSUPP;

		}

		if (rc) {

			printk(KERN_ERR "%s: Error attempting to encode "

			       "encrypted filename; rc = [%d]\n", __func__,

			ecryptfs_printk(KERN_ERR,

				"Error attempting to encode encrypted filename; rc = [%d]\n",

				rc);

			kfree((*encoded_name));

			(*encoded_name) = NULL;