eCryptfs: Remove netlink transport
PATCH 1/1 eCryptfs: Remove netlink transport
The netlink transport code has not worked for a while and the miscdev transport is a simpler solution. This patch removes the netlink code and makes the miscdev transport the only eCryptfs kernel to userspace transport.
Signed-off-by Tyler Hicks <[email protected]>
--- fs/ecryptfs/Makefile | 2 +- fs/ecryptfs/ecryptfs_kernel.h | 28 +---- fs/ecryptfs/keystore.c | 32 +++--- fs/ecryptfs/main.c | 19 ++-- fs/ecryptfs/messaging.c | 118 +++++-------------- fs/ecryptfs/netlink.c | 249 ----------------------------------------- 6 files changed, 60 insertions(+), 388 deletions(-) delete mode 100644 fs/ecryptfs/netlink.c
fs/ecryptfs/Makefile +1 -1
@@ -4,4 +4,4 @@ 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 netlink.o miscdev.o kthread.o debug.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
fs/ecryptfs/ecryptfs_kernel.h +5 -23
@@ -79,11 +79,6 @@#define ECRYPTFS_MAX_PKI_NAME_BYTES 16#define ECRYPTFS_DEFAULT_NUM_USERS 4#define ECRYPTFS_MAX_NUM_USERS 32768 -#define ECRYPTFS_TRANSPORT_NETLINK 0 -#define ECRYPTFS_TRANSPORT_CONNECTOR 1 -#define ECRYPTFS_TRANSPORT_RELAYFS 2 -#define ECRYPTFS_TRANSPORT_MISCDEV 3 -#define ECRYPTFS_DEFAULT_TRANSPORT ECRYPTFS_TRANSPORT_MISCDEV#define ECRYPTFS_XATTR_NAME "user.ecryptfs"#define RFC2440_CIPHER_DES3_EDE 0x02
@@ -400,8 +395,6 @@ struct ecryptfs_msg_ctx {struct mutex mux; }; -extern unsigned int ecryptfs_transport; -struct ecryptfs_daemon ;struct ecryptfs_daemon {
@@ -627,31 +620,20 @@ 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); -int ecryptfs_process_helo (unsigned int transport,uid_t euid, -struct user_namespace *user_ns,struct pid *pid); +int ecryptfs_process_helo (uid_t euid,struct user_namespace *user_ns, +struct pid *pid);int ecryptfs_process_quit (uid_t euid,struct user_namespace *user_ns,struct pid *pid);int ecryptfs_process_response (struct ecryptfs_message *msg,uid_t euid,struct user_namespace *user_ns,struct pid *pid,u32 seq); -int ecryptfs_send_message (unsigned int transport,char *data,int data_len, +int ecryptfs_send_message (char *data,int data_len,struct ecryptfs_msg_ctx **msg_ctx);int ecryptfs_wait_for_response (struct ecryptfs_msg_ctx *msg_ctx,struct ecryptfs_message **emsg); -int ecryptfs_init_messaging (unsigned int transport); -void ecryptfs_release_messaging (unsigned int transport); +int ecryptfs_init_messaging (void ); +void ecryptfs_release_messaging (void ); -int ecryptfs_send_netlink (char *data,int data_len, -struct ecryptfs_msg_ctx *msg_ctx,u8 msg_type, -u16 msg_flags,struct pid *daemon_pid); -int ecryptfs_init_netlink (void ); -void ecryptfs_release_netlink (void ); - -int ecryptfs_send_connector (char *data,int data_len, -struct ecryptfs_msg_ctx *msg_ctx,u8 msg_type, -u16 msg_flags,struct pid *daemon_pid); -int ecryptfs_init_connector (void ); -void ecryptfs_release_connector (void ); void ecryptfs_write_header_metadata(char *virt, struct ecryptfs_crypt_stat *crypt_stat,
fs/ecryptfs/keystore.c +15 -17
@@ -234,8 +234,8 @@ parse_tag_65_packet(struct ecryptfs_session_key *session_key, u8 *cipher_code, } i += data_len;if (message_len < (i + m_size)) { -ecryptfs_printk (KERN_ERR ,"The received netlink message is " -"shorter than expected\n" ); +ecryptfs_printk (KERN_ERR ,"The message received from ecryptfsd " +"is shorter than expected\n" ); rc = -EIO ; goto out; }
@@ -438,8 +438,8 @@ decrypt_pki_encrypted_session_key(struct ecryptfs_auth_tok *auth_tok,struct ecryptfs_msg_ctx *msg_ctx;struct ecryptfs_message *msg =NULL ;char *auth_tok_sig; -char *netlink_message; -size_t netlink_message_length; +char *payload; +size_t payload_len;int rc; rc =ecryptfs_get_auth_tok_sig (&auth_tok_sig, auth_tok);
@@ -449,15 +449,15 @@ decrypt_pki_encrypted_session_key(struct ecryptfs_auth_tok *auth_tok, goto out; } rc =write_tag_64_packet (auth_tok_sig, &(auth_tok->session_key), - &netlink_message, &netlink_message_length); + &payload, &payload_len);if (rc) {ecryptfs_printk (KERN_ERR ,"Failed to write tag 64 packet\n" ); goto out; } - rc =ecryptfs_send_message (ecryptfs_transport, netlink_message, - netlink_message_length, &msg_ctx); + rc =ecryptfs_send_message (payload, payload_len, &msg_ctx);if (rc) { -ecryptfs_printk (KERN_ERR ,"Error sending netlink message\n" ); +ecryptfs_printk (KERN_ERR ,"Error sending message to " +"ecryptfsd\n" ); goto out; } rc =ecryptfs_wait_for_response (msg_ctx, &msg);
@@ -1333,23 +1333,22 @@ pki_encrypt_session_key(struct ecryptfs_auth_tok *auth_tok, struct ecryptfs_key_record *key_rec) {struct ecryptfs_msg_ctx *msg_ctx =NULL ; -char *netlink_payload; -size_t netlink_payload_length; +char *payload =NULL ; +size_t payload_len;struct ecryptfs_message *msg;int rc; rc =write_tag_66_packet (auth_tok->token.private_key.signature,ecryptfs_code_for_cipher_string (crypt_stat), - crypt_stat, &netlink_payload, - &netlink_payload_length); + crypt_stat, &payload, &payload_len);if (rc) {ecryptfs_printk (KERN_ERR ,"Error generating tag 66 packet\n" ); goto out; } - rc =ecryptfs_send_message (ecryptfs_transport, netlink_payload, - netlink_payload_length, &msg_ctx); + rc =ecryptfs_send_message (payload, payload_len, &msg_ctx);if (rc) { -ecryptfs_printk (KERN_ERR ,"Error sending netlink message\n" ); +ecryptfs_printk (KERN_ERR ,"Error sending message to " +"ecryptfsd\n" ); goto out; } rc =ecryptfs_wait_for_response (msg_ctx, &msg);
@@ -1364,8 +1363,7 @@ pki_encrypt_session_key(struct ecryptfs_auth_tok *auth_tok,ecryptfs_printk (KERN_ERR ,"Error parsing tag 67 packet\n" );kfree (msg); out: -if (netlink_payload) -kfree (netlink_payload); +kfree (payload);return rc; }/**
fs/ecryptfs/main.c +8 -11
@@ -30,7 +30,6 @@#include <linux/namei.h> #include <linux/skbuff.h> #include <linux/crypto.h> -#include <linux/netlink.h> #include <linux/mount.h> #include <linux/pagemap.h> #include <linux/key.h>
@@ -49,8 +48,7 @@ MODULE_PARM_DESC(ecryptfs_verbosity, "0, which is Quiet)");/** -* Module parameter that defines the number of netlink message buffer -* elements +* Module parameter that defines the number of message buffer elements */ unsigned int ecryptfs_message_buf_len =ECRYPTFS_DEFAULT_MSG_CTX_ELEMS ;
@@ -60,9 +58,9 @@ MODULE_PARM_DESC(ecryptfs_message_buf_len,/** * Module parameter that defines the maximum guaranteed amount of time to wait -* for a response through netlink. The actual sleep time will be, more than +* for a response from ecryptfsd. The actual sleep time will be, more than * likely, a small amount greater than this specified value, but only less if -* the netlink message successfully arrives. +* the message successfully arrives. */ signed long ecryptfs_message_wait_timeout =ECRYPTFS_MAX_MSG_CTX_TTL /HZ ;
@@ -83,8 +81,6 @@ module_param(ecryptfs_number_of_users, uint, 0);MODULE_PARM_DESC (ecryptfs_number_of_users,"An estimate of the number of " "concurrent users of eCryptfs" ); -unsigned int ecryptfs_transport =ECRYPTFS_DEFAULT_TRANSPORT ; -void __ecryptfs_printk (const char *fmt, ...) {va_list args;
@@ -775,10 +771,11 @@ static int __init ecryptfs_init(void) "rc = [%d]\n", __func__, rc); goto out_do_sysfs_unregistration; } - rc =ecryptfs_init_messaging (ecryptfs_transport); + rc =ecryptfs_init_messaging ();if (rc) {printk (KERN_ERR "Failure occured while attempting to " -"initialize the eCryptfs netlink socket\n" ); +"initialize the communications channel to " +"ecryptfsd\n" ); goto out_destroy_kthread; } rc =ecryptfs_init_crypto ();
@@ -793,7 +790,7 @@ static int __init ecryptfs_init(void) goto out; out_release_messaging: -ecryptfs_release_messaging (ecryptfs_transport); +ecryptfs_release_messaging (); out_destroy_kthread:ecryptfs_destroy_kthread (); out_do_sysfs_unregistration:
@@ -814,7 +811,7 @@ static void __exit ecryptfs_exit(void)if (rc)printk (KERN_ERR "Failure whilst attempting to destroy crypto; " "rc = [%d]\n" , rc); -ecryptfs_release_messaging (ecryptfs_transport); +ecryptfs_release_messaging ();ecryptfs_destroy_kthread ();do_sysfs_unregistration ();unregister_filesystem (&ecryptfs_fs_type);
fs/ecryptfs/messaging.c +31 -87
213 lines not on this page · raw message
fs/ecryptfs/netlink.c deleted +0 -249
249 lines not on this page · raw message
Signature · 1 line
1.5.3.7