Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e8a462a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6:
  ecryptfs: remove unnecessary decrypt when extending a file
  ecryptfs: Fix ecryptfs_printk() size_t warnings
  fs/ecryptfs: Add printf format/argument verification and fix fallout
  ecryptfs: fixed testing of file descriptor flags
  ecryptfs: test lower_file pointer when lower_file_mutex is locked
  ecryptfs: missing initialization of the superblock 'magic' field
  ecryptfs: moved ECRYPTFS_SUPER_MAGIC definition to linux/magic.h
  ecryptfs: fix truncation error in ecryptfs_read_update_atime
parents cf78859f 24562486

fs/ecryptfs/crypto.c

+14 −16
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ static int encrypt_scatterlist(struct ecryptfs_crypt_stat *crypt_stat, 
	BUG_ON(!crypt_stat || !crypt_stat->tfm

	       || !(crypt_stat->flags & ECRYPTFS_STRUCT_INITIALIZED));

	if (unlikely(ecryptfs_verbosity > 0)) {

		ecryptfs_printk(KERN_DEBUG, "Key size [%d]; key:\n",

		ecryptfs_printk(KERN_DEBUG, "Key size [%zd]; key:\n",

				crypt_stat->key_size);

		ecryptfs_dump_hex(crypt_stat->key,

				  crypt_stat->key_size);
@@ -413,10 +413,9 @@ static int ecryptfs_encrypt_extent(struct page *enc_extent_page, 
	rc = ecryptfs_derive_iv(extent_iv, crypt_stat,

				(extent_base + extent_offset));

	if (rc) {

		ecryptfs_printk(KERN_ERR, "Error attempting to "

				"derive IV for extent [0x%.16x]; "

				"rc = [%d]\n", (extent_base + extent_offset),

				rc);

		ecryptfs_printk(KERN_ERR, "Error attempting to derive IV for "

			"extent [0x%.16llx]; rc = [%d]\n",

			(unsigned long long)(extent_base + extent_offset), rc);

		goto out;

	}

	if (unlikely(ecryptfs_verbosity > 0)) {
@@ -443,9 +442,9 @@ static int ecryptfs_encrypt_extent(struct page *enc_extent_page, 
	}

	rc = 0;

	if (unlikely(ecryptfs_verbosity > 0)) {

		ecryptfs_printk(KERN_DEBUG, "Encrypt extent [0x%.16x]; "

				"rc = [%d]\n", (extent_base + extent_offset),

				rc);

		ecryptfs_printk(KERN_DEBUG, "Encrypt extent [0x%.16llx]; "

			"rc = [%d]\n",

			(unsigned long long)(extent_base + extent_offset), rc);

		ecryptfs_printk(KERN_DEBUG, "First 8 bytes after "

				"encryption:\n");

		ecryptfs_dump_hex((char *)(page_address(enc_extent_page)), 8);
@@ -540,10 +539,9 @@ static int ecryptfs_decrypt_extent(struct page *page, 
	rc = ecryptfs_derive_iv(extent_iv, crypt_stat,

				(extent_base + extent_offset));

	if (rc) {

		ecryptfs_printk(KERN_ERR, "Error attempting to "

				"derive IV for extent [0x%.16x]; "

				"rc = [%d]\n", (extent_base + extent_offset),

				rc);

		ecryptfs_printk(KERN_ERR, "Error attempting to derive IV for "

			"extent [0x%.16llx]; rc = [%d]\n",

			(unsigned long long)(extent_base + extent_offset), rc);

		goto out;

	}

	if (unlikely(ecryptfs_verbosity > 0)) {
@@ -571,9 +569,9 @@ static int ecryptfs_decrypt_extent(struct page *page, 
	}

	rc = 0;

	if (unlikely(ecryptfs_verbosity > 0)) {

		ecryptfs_printk(KERN_DEBUG, "Decrypt extent [0x%.16x]; "

				"rc = [%d]\n", (extent_base + extent_offset),

				rc);

		ecryptfs_printk(KERN_DEBUG, "Decrypt extent [0x%.16llx]; "

			"rc = [%d]\n",

			(unsigned long long)(extent_base + extent_offset), rc);

		ecryptfs_printk(KERN_DEBUG, "First 8 bytes after "

				"decryption:\n");

		ecryptfs_dump_hex((char *)(page_address(page)
@@ -780,7 +778,7 @@ int ecryptfs_init_crypt_ctx(struct ecryptfs_crypt_stat *crypt_stat) 
	}

	ecryptfs_printk(KERN_DEBUG,

			"Initializing cipher [%s]; strlen = [%d]; "

			"key_size_bits = [%d]\n",

			"key_size_bits = [%zd]\n",

			crypt_stat->cipher, (int)strlen(crypt_stat->cipher),

			crypt_stat->key_size << 3);

	if (crypt_stat->tfm) {

fs/ecryptfs/ecryptfs_kernel.h

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,6 @@ ecryptfs_get_key_payload_data(struct key *key) 
		(((struct user_key_payload*)key->payload.data)->data);

}



#define ECRYPTFS_SUPER_MAGIC 0xf15f

#define ECRYPTFS_MAX_KEYSET_SIZE 1024

#define ECRYPTFS_MAX_CIPHER_NAME_SIZE 32

#define ECRYPTFS_MAX_NUM_ENC_KEYS 64
@@ -584,6 +583,7 @@ ecryptfs_set_dentry_lower_mnt(struct dentry *dentry, struct vfsmount *lower_mnt) 


#define ecryptfs_printk(type, fmt, arg...) \

        __ecryptfs_printk(type "%s: " fmt, __func__, ## arg);

__attribute__ ((format(printf, 1, 2)))

void __ecryptfs_printk(const char *fmt, ...);



extern const struct file_operations ecryptfs_main_fops;

fs/ecryptfs/file.c

+13 −15
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ static ssize_t ecryptfs_read_update_atime(struct kiocb *iocb, 
				const struct iovec *iov,

				unsigned long nr_segs, loff_t pos)

{

	int rc;

	ssize_t rc;

	struct dentry *lower_dentry;

	struct vfsmount *lower_vfsmount;

	struct file *file = iocb->ki_filp;
@@ -191,7 +191,6 @@ static int ecryptfs_open(struct inode *inode, struct file *file) 
				      | ECRYPTFS_ENCRYPTED);

	}

	mutex_unlock(&crypt_stat->cs_mutex);

	if (!ecryptfs_inode_to_private(inode)->lower_file) {

	rc = ecryptfs_init_persistent_file(ecryptfs_dentry);

	if (rc) {

		printk(KERN_ERR "%s: Error attempting to initialize "
@@ -200,9 +199,8 @@ static int ecryptfs_open(struct inode *inode, struct file *file) 
			ecryptfs_dentry->d_name.name, rc);

		goto out_free;

	}

	}

	if ((ecryptfs_inode_to_private(inode)->lower_file->f_flags & O_RDONLY)

	    && !(file->f_flags & O_RDONLY)) {

	if ((ecryptfs_inode_to_private(inode)->lower_file->f_flags & O_ACCMODE)

	    == O_RDONLY && (file->f_flags & O_ACCMODE) != O_RDONLY) {

		rc = -EPERM;

		printk(KERN_WARNING "%s: Lower persistent file is RO; eCryptfs "

		       "file must hence be opened RO\n", __func__);
@@ -243,9 +241,9 @@ static int ecryptfs_open(struct inode *inode, struct file *file) 
		}

	}

	mutex_unlock(&crypt_stat->cs_mutex);

	ecryptfs_printk(KERN_DEBUG, "inode w/ addr = [0x%p], i_ino = [0x%.16x] "

			"size: [0x%.16x]\n", inode, inode->i_ino,

			i_size_read(inode));

	ecryptfs_printk(KERN_DEBUG, "inode w/ addr = [0x%p], i_ino = "

			"[0x%.16lx] size: [0x%.16llx]\n", inode, inode->i_ino,

			(unsigned long long)i_size_read(inode));

	goto out;

out_free:

	kmem_cache_free(ecryptfs_file_info_cache,

fs/ecryptfs/inode.c

+14 −18
Original line number Diff line number Diff line
@@ -185,7 +185,6 @@ static int ecryptfs_initialize_file(struct dentry *ecryptfs_dentry) 
				"context; rc = [%d]\n", rc);

		goto out;

	}

	if (!ecryptfs_inode_to_private(ecryptfs_dentry->d_inode)->lower_file) {

	rc = ecryptfs_init_persistent_file(ecryptfs_dentry);

	if (rc) {

		printk(KERN_ERR "%s: Error attempting to initialize "
@@ -194,7 +193,6 @@ static int ecryptfs_initialize_file(struct dentry *ecryptfs_dentry) 
			ecryptfs_dentry->d_name.name, rc);

		goto out;

	}

	}

	rc = ecryptfs_write_metadata(ecryptfs_dentry);

	if (rc) {

		printk(KERN_ERR "Error writing headers; rc = [%d]\n", rc);
@@ -302,7 +300,6 @@ int ecryptfs_lookup_and_interpose_lower(struct dentry *ecryptfs_dentry, 
		rc = -ENOMEM;

		goto out;

	}

	if (!ecryptfs_inode_to_private(ecryptfs_dentry->d_inode)->lower_file) {

	rc = ecryptfs_init_persistent_file(ecryptfs_dentry);

	if (rc) {

		printk(KERN_ERR "%s: Error attempting to initialize "
@@ -311,7 +308,6 @@ int ecryptfs_lookup_and_interpose_lower(struct dentry *ecryptfs_dentry, 
			ecryptfs_dentry->d_name.name, rc);

		goto out_free_kmem;

	}

	}

	crypt_stat = &ecryptfs_inode_to_private(

					ecryptfs_dentry->d_inode)->crypt_stat;

	/* TODO: lock for crypt_stat comparison */

fs/ecryptfs/keystore.c

+13 −13
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static int process_request_key_err(long err_code) 
		break;

	default:

		ecryptfs_printk(KERN_WARNING, "Unknown error code: "

				"[0x%.16x]\n", err_code);

				"[0x%.16lx]\n", err_code);

		rc = -EINVAL;

	}

	return rc;
@@ -130,7 +130,7 @@ int ecryptfs_write_packet_length(char *dest, size_t size, 
	} else {

		rc = -EINVAL;

		ecryptfs_printk(KERN_WARNING,

				"Unsupported packet size: [%d]\n", size);

				"Unsupported packet size: [%zd]\n", size);

	}

	return rc;

}
@@ -1672,7 +1672,7 @@ decrypt_passphrase_encrypted_session_key(struct ecryptfs_auth_tok *auth_tok, 
	       auth_tok->session_key.decrypted_key_size);

	crypt_stat->flags |= ECRYPTFS_KEY_VALID;

	if (unlikely(ecryptfs_verbosity > 0)) {

		ecryptfs_printk(KERN_DEBUG, "FEK of size [%d]:\n",

		ecryptfs_printk(KERN_DEBUG, "FEK of size [%zd]:\n",

				crypt_stat->key_size);

		ecryptfs_dump_hex(crypt_stat->key,

				  crypt_stat->key_size);
@@ -1754,7 +1754,7 @@ int ecryptfs_parse_packet_set(struct ecryptfs_crypt_stat *crypt_stat, 
			if (ECRYPTFS_SIG_SIZE != tag_11_contents_size) {

				ecryptfs_printk(KERN_ERR, "Expected "

						"signature of size [%d]; "

						"read size [%d]\n",

						"read size [%zd]\n",

						ECRYPTFS_SIG_SIZE,

						tag_11_contents_size);

				rc = -EIO;
@@ -1787,8 +1787,8 @@ int ecryptfs_parse_packet_set(struct ecryptfs_crypt_stat *crypt_stat, 
			goto out_wipe_list;

			break;

		default:

			ecryptfs_printk(KERN_DEBUG, "No packet at offset "

					"[%d] of the file header; hex value of "

			ecryptfs_printk(KERN_DEBUG, "No packet at offset [%zd] "

					"of the file header; hex value of "

					"character is [0x%.2x]\n", i, src[i]);

			next_packet_is_auth_tok_packet = 0;

		}
@@ -1864,8 +1864,8 @@ found_matching_auth_tok: 
				"session key for authentication token with sig "

				"[%.*s]; rc = [%d]. Removing auth tok "

				"candidate from the list and searching for "

				"the next match.\n", candidate_auth_tok_sig,

				ECRYPTFS_SIG_SIZE_HEX, rc);

				"the next match.\n", ECRYPTFS_SIG_SIZE_HEX,

				candidate_auth_tok_sig,	rc);

		list_for_each_entry_safe(auth_tok_list_item,

					 auth_tok_list_item_tmp,

					 &auth_tok_list, list) {
@@ -2168,7 +2168,7 @@ write_tag_3_packet(char *dest, size_t *remaining_bytes, 
	if (encrypted_session_key_valid) {

		ecryptfs_printk(KERN_DEBUG, "encrypted_session_key_valid != 0; "

				"using auth_tok->session_key.encrypted_key, "

				"where key_rec->enc_key_size = [%d]\n",

				"where key_rec->enc_key_size = [%zd]\n",

				key_rec->enc_key_size);

		memcpy(key_rec->enc_key,

		       auth_tok->session_key.encrypted_key,
@@ -2198,7 +2198,7 @@ write_tag_3_packet(char *dest, size_t *remaining_bytes, 
	if (rc < 1 || rc > 2) {

		ecryptfs_printk(KERN_ERR, "Error generating scatterlist "

				"for crypt_stat session key; expected rc = 1; "

				"got rc = [%d]. key_rec->enc_key_size = [%d]\n",

				"got rc = [%d]. key_rec->enc_key_size = [%zd]\n",

				rc, key_rec->enc_key_size);

		rc = -ENOMEM;

		goto out;
@@ -2209,7 +2209,7 @@ write_tag_3_packet(char *dest, size_t *remaining_bytes, 
		ecryptfs_printk(KERN_ERR, "Error generating scatterlist "

				"for crypt_stat encrypted session key; "

				"expected rc = 1; got rc = [%d]. "

				"key_rec->enc_key_size = [%d]\n", rc,

				"key_rec->enc_key_size = [%zd]\n", rc,

				key_rec->enc_key_size);

		rc = -ENOMEM;

		goto out;
@@ -2224,7 +2224,7 @@ write_tag_3_packet(char *dest, size_t *remaining_bytes, 
		goto out;

	}

	rc = 0;

	ecryptfs_printk(KERN_DEBUG, "Encrypting [%d] bytes of the key\n",

	ecryptfs_printk(KERN_DEBUG, "Encrypting [%zd] bytes of the key\n",

			crypt_stat->key_size);

	rc = crypto_blkcipher_encrypt(&desc, dst_sg, src_sg,

				      (*key_rec).enc_key_size);
@@ -2235,7 +2235,7 @@ write_tag_3_packet(char *dest, size_t *remaining_bytes, 
	}

	ecryptfs_printk(KERN_DEBUG, "This should be the encrypted key:\n");

	if (ecryptfs_verbosity > 0) {

		ecryptfs_printk(KERN_DEBUG, "EFEK of size [%d]:\n",

		ecryptfs_printk(KERN_DEBUG, "EFEK of size [%zd]:\n",

				key_rec->enc_key_size);

		ecryptfs_dump_hex(key_rec->enc_key,

				  key_rec->enc_key_size);