Commit 233a0c0f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ecryptfs-7.0-rc1-fixes' of... 

Merge tag 'ecryptfs-7.0-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs

Pull ecryptfs updates from Tyler Hicks:
 "This consists of some really minor typo fixes that fell through the
  cracks and some more recent code cleanups:

   - Comment typo fixes

   - Removal of an unused function declaration

   - Use strscpy() instead of the deprecated strcpy()

   - Use string copying helpers instead of memcpy() and manually
     terminating strings"

* tag 'ecryptfs-7.0-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
  ecryptfs: Replace memcpy + NUL termination in ecryptfs_copy_filename
  ecryptfs: Drop redundant NUL terminations after calling ecryptfs_to_hex
  ecryptfs: Replace memcpy + NUL termination in ecryptfs_new_file_context
  ecryptfs: Replace strcpy with strscpy in ecryptfs_validate_options
  ecryptfs: Replace strcpy with strscpy in ecryptfs_cipher_code_to_string
  ecryptfs: Replace strcpy with strscpy in ecryptfs_set_default_crypt_stat_vals
  ecryptfs: simplify list initialization in ecryptfs_parse_packet_set()
  ecryptfs: Remove unused declartion ecryptfs_fill_zeros()
  ecryptfs: Fix packet format comment in parse_tag_67_packet()
  ecryptfs: comment typo fix
  ecryptfs: keystore: Fix typo 'the the' in comment
parents 219d7660 99853d9d

fs/ecryptfs/crypto.c

+13 −25
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/file.h>

#include <linux/scatterlist.h>

#include <linux/slab.h>

#include <linux/string.h>

#include <linux/unaligned.h>

#include <linux/kernel.h>

#include <linux/xattr.h>
@@ -645,7 +646,7 @@ static void ecryptfs_set_default_crypt_stat_vals( 
	ecryptfs_copy_mount_wide_flags_to_inode_flags(crypt_stat,

						      mount_crypt_stat);

	ecryptfs_set_default_sizes(crypt_stat);

	strcpy(crypt_stat->cipher, ECRYPTFS_DEFAULT_CIPHER);

	strscpy(crypt_stat->cipher, ECRYPTFS_DEFAULT_CIPHER);

	crypt_stat->key_size = ECRYPTFS_DEFAULT_KEY_BYTES;

	crypt_stat->flags &= ~(ECRYPTFS_KEY_VALID);

	crypt_stat->file_version = ECRYPTFS_FILE_VERSION;
@@ -678,7 +679,6 @@ int ecryptfs_new_file_context(struct inode *ecryptfs_inode) 
	struct ecryptfs_mount_crypt_stat *mount_crypt_stat =

	    &ecryptfs_superblock_to_private(

		    ecryptfs_inode->i_sb)->mount_crypt_stat;

	int cipher_name_len;

	int rc = 0;



	ecryptfs_set_default_crypt_stat_vals(crypt_stat, mount_crypt_stat);
@@ -692,12 +692,8 @@ int ecryptfs_new_file_context(struct inode *ecryptfs_inode) 
		       "to the inode key sigs; rc = [%d]\n", rc);

		goto out;

	}

	cipher_name_len =

		strlen(mount_crypt_stat->global_default_cipher_name);

	memcpy(crypt_stat->cipher,

	       mount_crypt_stat->global_default_cipher_name,

	       cipher_name_len);

	crypt_stat->cipher[cipher_name_len] = '\0';

	strscpy(crypt_stat->cipher,

		mount_crypt_stat->global_default_cipher_name);

	crypt_stat->key_size =

		mount_crypt_stat->global_default_cipher_key_size;

	ecryptfs_generate_new_key(crypt_stat);
@@ -861,11 +857,12 @@ u8 ecryptfs_code_for_cipher_string(char *cipher_name, size_t key_bytes) 
/**

 * ecryptfs_cipher_code_to_string

 * @str: Destination to write out the cipher name

 * @size: Destination buffer size

 * @cipher_code: The code to convert to cipher name string

 *

 * Returns zero on success

 */

int ecryptfs_cipher_code_to_string(char *str, u8 cipher_code)

int ecryptfs_cipher_code_to_string(char *str, size_t size, u8 cipher_code)

{

	int rc = 0;

	int i;
@@ -873,7 +870,8 @@ int ecryptfs_cipher_code_to_string(char *str, u8 cipher_code) 
	str[0] = '\0';

	for (i = 0; i < ARRAY_SIZE(ecryptfs_cipher_code_str_map); i++)

		if (cipher_code == ecryptfs_cipher_code_str_map[i].cipher_code)

			strcpy(str, ecryptfs_cipher_code_str_map[i].cipher_str);

			strscpy(str, ecryptfs_cipher_code_str_map[i].cipher_str,

				size);

	if (str[0] == '\0') {

		ecryptfs_printk(KERN_WARNING, "Cipher code not recognized: "

				"[%d]\n", cipher_code);
@@ -1220,7 +1218,7 @@ static int ecryptfs_read_headers_virt(char *page_virt, 


/**

 * ecryptfs_read_xattr_region

 * @page_virt: The vitual address into which to read the xattr data

 * @page_virt: The virtual address into which to read the xattr data

 * @ecryptfs_inode: The eCryptfs inode

 *

 * Attempts to read the crypto metadata from the extended attribute
@@ -1420,21 +1418,11 @@ ecryptfs_encrypt_filename(struct ecryptfs_filename *filename, 
static int ecryptfs_copy_filename(char **copied_name, size_t *copied_name_size,

				  const char *name, size_t name_size)

{

	int rc = 0;



	(*copied_name) = kmalloc((name_size + 1), GFP_KERNEL);

	if (!(*copied_name)) {

		rc = -ENOMEM;

		goto out;

	}

	memcpy((void *)(*copied_name), (void *)name, name_size);

	(*copied_name)[(name_size)] = '\0';	/* Only for convenience

						 * in printing out the

						 * string in debug

						 * messages */

	(*copied_name) = kmemdup_nul(name, name_size, GFP_KERNEL);

	if (!(*copied_name))

		return -ENOMEM;

	(*copied_name_size) = name_size;

out:

	return rc;

	return 0;

}



/**

fs/ecryptfs/debug.c

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ void ecryptfs_dump_auth_tok(struct ecryptfs_auth_tok *auth_tok) 
		ecryptfs_printk(KERN_DEBUG, " * passphrase type\n");

		ecryptfs_to_hex(salt, auth_tok->token.password.salt,

				ECRYPTFS_SALT_SIZE);

		salt[ECRYPTFS_SALT_SIZE * 2] = '\0';

		ecryptfs_printk(KERN_DEBUG, " * salt = [%s]\n", salt);

		if (auth_tok->token.password.flags &

		    ECRYPTFS_PERSISTENT_PASSWORD) {

fs/ecryptfs/ecryptfs_kernel.h

+1 −2
Original line number Diff line number Diff line
@@ -543,7 +543,6 @@ int ecryptfs_decode_and_decrypt_filename(char **decrypted_name, 
					 size_t *decrypted_name_size,

					 struct super_block *sb,

					 const char *name, size_t name_size);

int ecryptfs_fill_zeros(struct file *file, loff_t new_length);

int ecryptfs_encrypt_and_encode_filename(

	char **encoded_name,

	size_t *encoded_name_size,
@@ -573,7 +572,7 @@ int ecryptfs_read_and_validate_header_region(struct inode *inode); 
int ecryptfs_read_and_validate_xattr_region(struct dentry *dentry,

					    struct inode *inode);

u8 ecryptfs_code_for_cipher_string(char *cipher_name, size_t key_bytes);

int ecryptfs_cipher_code_to_string(char *str, u8 cipher_code);

int ecryptfs_cipher_code_to_string(char *str, size_t size, u8 cipher_code);

void ecryptfs_set_default_sizes(struct ecryptfs_crypt_stat *crypt_stat);

int ecryptfs_generate_key_packet_set(char *dest_base,

				     struct ecryptfs_crypt_stat *crypt_stat,

fs/ecryptfs/keystore.c

+10 −9
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ parse_tag_67_packet(struct ecryptfs_key_record *key_rec, 
	int rc;



	/*

	 *              ***** TAG 65 Packet Format *****

	 *              ***** TAG 67 Packet Format *****

	 *    | Content Type                       | 1 byte       |

	 *    | Status Indicator                   | 1 byte       |

	 *    | Encrypted File Encryption Key Size | 1 or 2 bytes |
@@ -837,7 +837,7 @@ struct ecryptfs_parse_tag_70_packet_silly_stack { 
 * @filename: This function kmalloc's the memory for the filename

 * @filename_size: This function sets this to the amount of memory

 *                 kmalloc'd for the filename

 * @packet_size: This function sets this to the the number of octets

 * @packet_size: This function sets this to the number of octets

 *               in the packet parsed

 * @mount_crypt_stat: The mount-wide cryptographic context

 * @data: The memory location containing the start of the tag 70
@@ -908,10 +908,11 @@ ecryptfs_parse_tag_70_packet(char **filename, size_t *filename_size, 
	(*packet_size) += s->packet_size_len;

	ecryptfs_to_hex(s->fnek_sig_hex, &data[(*packet_size)],

			ECRYPTFS_SIG_SIZE);

	s->fnek_sig_hex[ECRYPTFS_SIG_SIZE_HEX] = '\0';

	(*packet_size) += ECRYPTFS_SIG_SIZE;

	s->cipher_code = data[(*packet_size)++];

	rc = ecryptfs_cipher_code_to_string(s->cipher_string, s->cipher_code);

	rc = ecryptfs_cipher_code_to_string(s->cipher_string,

					    sizeof(s->cipher_string),

					    s->cipher_code);

	if (rc) {

		printk(KERN_WARNING "%s: Cipher code [%d] is invalid\n",

		       __func__, s->cipher_code);
@@ -1129,7 +1130,9 @@ decrypt_pki_encrypted_session_key(struct ecryptfs_auth_tok *auth_tok, 
	memcpy(crypt_stat->key, auth_tok->session_key.decrypted_key,

	       auth_tok->session_key.decrypted_key_size);

	crypt_stat->key_size = auth_tok->session_key.decrypted_key_size;

	rc = ecryptfs_cipher_code_to_string(crypt_stat->cipher, cipher_code);

	rc = ecryptfs_cipher_code_to_string(crypt_stat->cipher,

					    sizeof(crypt_stat->cipher),

					    cipher_code);

	if (rc) {

		ecryptfs_printk(KERN_ERR, "Cipher code [%d] is invalid\n",

				cipher_code);
@@ -1395,6 +1398,7 @@ parse_tag_3_packet(struct ecryptfs_crypt_stat *crypt_stat, 
		goto out_free;

	}

	rc = ecryptfs_cipher_code_to_string(crypt_stat->cipher,

					    sizeof(crypt_stat->cipher),

					    (u16)data[(*packet_size)]);

	if (rc)

		goto out_free;
@@ -1716,7 +1720,7 @@ int ecryptfs_parse_packet_set(struct ecryptfs_crypt_stat *crypt_stat, 
	size_t i = 0;

	size_t found_auth_tok;

	size_t next_packet_is_auth_tok_packet;

	struct list_head auth_tok_list;

	LIST_HEAD(auth_tok_list);

	struct ecryptfs_auth_tok *matching_auth_tok;

	struct ecryptfs_auth_tok *candidate_auth_tok;

	char *candidate_auth_tok_sig;
@@ -1729,7 +1733,6 @@ int ecryptfs_parse_packet_set(struct ecryptfs_crypt_stat *crypt_stat, 
	struct key *auth_tok_key = NULL;

	int rc = 0;



	INIT_LIST_HEAD(&auth_tok_list);

	/* Parse the header to find as many packets as we can; these will be

	 * added the our &auth_tok_list */

	next_packet_is_auth_tok_packet = 1;
@@ -1777,8 +1780,6 @@ int ecryptfs_parse_packet_set(struct ecryptfs_crypt_stat *crypt_stat, 
			}

			ecryptfs_to_hex(new_auth_tok->token.password.signature,

					sig_tmp_space, tag_11_contents_size);

			new_auth_tok->token.password.signature[

				ECRYPTFS_PASSWORD_SIG_SIZE] = '\0';

			crypt_stat->flags |= ECRYPTFS_ENCRYPTED;

			break;

		case ECRYPTFS_TAG_1_PACKET_TYPE:

fs/ecryptfs/main.c

+5 −4
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/fs_stack.h>

#include <linux/sysfs.h>

#include <linux/slab.h>

#include <linux/string.h>

#include <linux/magic.h>

#include "ecryptfs_kernel.h"
@@ -354,12 +355,12 @@ static int ecryptfs_validate_options(struct fs_context *fc) 
		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,

		strscpy(mount_crypt_stat->global_default_cipher_name,

			ECRYPTFS_DEFAULT_CIPHER);

	}

	if ((mount_crypt_stat->flags & ECRYPTFS_GLOBAL_ENCRYPT_FILENAMES)

	    && !ctx->fn_cipher_name_set)

		strcpy(mount_crypt_stat->global_default_fn_cipher_name,

		strscpy(mount_crypt_stat->global_default_fn_cipher_name,

			mount_crypt_stat->global_default_cipher_name);

	if (!ctx->cipher_key_bytes_set)

		mount_crypt_stat->global_default_cipher_key_size = 0;