Commit e2e091fd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ecryptfs-3.9-rc2-fixes' of... 

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

Pull ecryptfs fixes from Tyler Hicks:
 "Minor code cleanups and new Kconfig option to disable /dev/ecryptfs

  The code cleanups fix up W=1 compiler warnings and some unnecessary
  checks.  The new Kconfig option, defaulting to N, allows the rarely
  used eCryptfs kernel to userspace communication channel to be compiled
  out.  This may be the first step in it being eventually removed."

Hmm.  I'm not sure whether these should be called "fixes", and it
probably should have gone in the merge window.  But I'll let it slide.

* tag 'ecryptfs-3.9-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
  eCryptfs: allow userspace messaging to be disabled
  eCryptfs: Fix redundant error check on ecryptfs_find_daemon_by_euid()
  ecryptfs: ecryptfs_msg_ctx_alloc_to_free(): remove kfree() redundant null check
  eCryptfs: decrypt_pki_encrypted_session_key(): remove kfree() redundant null check
  eCryptfs: remove unneeded checks in virt_to_scatterlist()
  eCryptfs: Fix -Wmissing-prototypes warnings
  eCryptfs: Fix -Wunused-but-set-variable warnings
  eCryptfs: initialize payload_len in keystore.c
parents cd66acb4 290502be

fs/ecryptfs/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -12,3 +12,11 @@ config ECRYPT_FS 


	  To compile this file system support as a module, choose M here: the

	  module will be called ecryptfs.



config ECRYPT_FS_MESSAGING

	bool "Enable notifications for userspace key wrap/unwrap"

	depends on ECRYPT_FS

	help

	  Enables the /dev/ecryptfs entry for use by ecryptfsd. This allows

	  for userspace to wrap/unwrap file encryption keys by other

	  backends, like OpenSSL.

fs/ecryptfs/Makefile

+5 −2
Original line number Diff line number Diff line 
#

# Makefile for the Linux 2.6 eCryptfs

# Makefile for the Linux eCryptfs

#



obj-$(CONFIG_ECRYPT_FS) += ecryptfs.o



ecryptfs-objs := dentry.o file.o inode.o main.o super.o mmap.o read_write.o crypto.o keystore.o messaging.o miscdev.o kthread.o debug.o
 
ecryptfs-y := dentry.o file.o inode.o main.o super.o mmap.o read_write.o \

	      crypto.o keystore.o kthread.o debug.o



ecryptfs-$(CONFIG_ECRYPT_FS_MESSAGING) += messaging.o miscdev.o

fs/ecryptfs/crypto.c

+3 −6
Original line number Diff line number Diff line
@@ -301,16 +301,13 @@ int virt_to_scatterlist(const void *addr, int size, struct scatterlist *sg, 
	while (size > 0 && i < sg_size) {

		pg = virt_to_page(addr);

		offset = offset_in_page(addr);

		if (sg)

		sg_set_page(&sg[i], pg, 0, offset);

		remainder_of_page = PAGE_CACHE_SIZE - offset;

		if (size >= remainder_of_page) {

			if (sg)

			sg[i].length = remainder_of_page;

			addr += remainder_of_page;

			size -= remainder_of_page;

		} else {

			if (sg)

			sg[i].length = size;

			addr += size;

			size = 0;

fs/ecryptfs/dentry.c

+0 −2
Original line number Diff line number Diff line
@@ -45,14 +45,12 @@ 
static int ecryptfs_d_revalidate(struct dentry *dentry, unsigned int flags)

{

	struct dentry *lower_dentry;

	struct vfsmount *lower_mnt;

	int rc = 1;



	if (flags & LOOKUP_RCU)

		return -ECHILD;



	lower_dentry = ecryptfs_dentry_to_lower(dentry);

	lower_mnt = ecryptfs_dentry_to_lower_mnt(dentry);

	if (!lower_dentry->d_op || !lower_dentry->d_op->d_revalidate)

		goto out;

	rc = lower_dentry->d_op->d_revalidate(lower_dentry, flags);

fs/ecryptfs/ecryptfs_kernel.h

+38 −2
Original line number Diff line number Diff line
@@ -172,6 +172,19 @@ ecryptfs_get_key_payload_data(struct key *key) 
#define ECRYPTFS_FNEK_ENCRYPTED_FILENAME_PREFIX_SIZE 24

#define ECRYPTFS_ENCRYPTED_DENTRY_NAME_LEN (18 + 1 + 4 + 1 + 32)



#ifdef CONFIG_ECRYPT_FS_MESSAGING

# define ECRYPTFS_VERSIONING_MASK_MESSAGING (ECRYPTFS_VERSIONING_DEVMISC \

					     | ECRYPTFS_VERSIONING_PUBKEY)

#else

# define ECRYPTFS_VERSIONING_MASK_MESSAGING 0

#endif



#define ECRYPTFS_VERSIONING_MASK (ECRYPTFS_VERSIONING_PASSPHRASE \

				  | ECRYPTFS_VERSIONING_PLAINTEXT_PASSTHROUGH \

				  | ECRYPTFS_VERSIONING_XATTR \

				  | ECRYPTFS_VERSIONING_MULTKEY \

				  | ECRYPTFS_VERSIONING_MASK_MESSAGING \

				  | ECRYPTFS_VERSIONING_FILENAME_ENCRYPTION)

struct ecryptfs_key_sig {

	struct list_head crypt_stat_list;

	char keysig[ECRYPTFS_SIG_SIZE_HEX + 1];
@@ -399,7 +412,9 @@ struct ecryptfs_daemon { 
	struct hlist_node euid_chain;

};



#ifdef CONFIG_ECRYPT_FS_MESSAGING

extern struct mutex ecryptfs_daemon_hash_mux;

#endif



static inline size_t

ecryptfs_lower_header_size(struct ecryptfs_crypt_stat *crypt_stat)
@@ -610,6 +625,7 @@ int 
ecryptfs_setxattr(struct dentry *dentry, const char *name, const void *value,

		  size_t size, int flags);

int ecryptfs_read_xattr_region(char *page_virt, struct inode *ecryptfs_inode);

#ifdef CONFIG_ECRYPT_FS_MESSAGING

int ecryptfs_process_response(struct ecryptfs_daemon *daemon,

			      struct ecryptfs_message *msg, u32 seq);

int ecryptfs_send_message(char *data, int data_len,
@@ -618,6 +634,24 @@ int ecryptfs_wait_for_response(struct ecryptfs_msg_ctx *msg_ctx, 
			       struct ecryptfs_message **emsg);

int ecryptfs_init_messaging(void);

void ecryptfs_release_messaging(void);

#else

static inline int ecryptfs_init_messaging(void)

{

	return 0;

}

static inline void ecryptfs_release_messaging(void)

{ }

static inline int ecryptfs_send_message(char *data, int data_len,

					struct ecryptfs_msg_ctx **msg_ctx)

{

	return -ENOTCONN;

}

static inline int ecryptfs_wait_for_response(struct ecryptfs_msg_ctx *msg_ctx,

					     struct ecryptfs_message **emsg)

{

	return -ENOMSG;

}

#endif



void

ecryptfs_write_header_metadata(char *virt,
@@ -655,12 +689,11 @@ int ecryptfs_read_lower_page_segment(struct page *page_for_ecryptfs, 
				     size_t offset_in_page, size_t size,

				     struct inode *ecryptfs_inode);

struct page *ecryptfs_get_locked_page(struct inode *inode, loff_t index);

int ecryptfs_exorcise_daemon(struct ecryptfs_daemon *daemon);

int ecryptfs_find_daemon_by_euid(struct ecryptfs_daemon **daemon);

int ecryptfs_parse_packet_length(unsigned char *data, size_t *size,

				 size_t *length_size);

int ecryptfs_write_packet_length(char *dest, size_t size,

				 size_t *packet_size_length);

#ifdef CONFIG_ECRYPT_FS_MESSAGING

int ecryptfs_init_ecryptfs_miscdev(void);

void ecryptfs_destroy_ecryptfs_miscdev(void);

int ecryptfs_send_miscdev(char *data, size_t data_size,
@@ -669,6 +702,9 @@ int ecryptfs_send_miscdev(char *data, size_t data_size, 
void ecryptfs_msg_ctx_alloc_to_free(struct ecryptfs_msg_ctx *msg_ctx);

int

ecryptfs_spawn_daemon(struct ecryptfs_daemon **daemon, struct file *file);

int ecryptfs_exorcise_daemon(struct ecryptfs_daemon *daemon);

int ecryptfs_find_daemon_by_euid(struct ecryptfs_daemon **daemon);

#endif

int ecryptfs_init_kthread(void);

void ecryptfs_destroy_kthread(void);

int ecryptfs_privileged_open(struct file **lower_file,

CRA Git | Maintained and supported by SUSTech CRA and CCSE