Commit cdf8c58a authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

userns: Convert ecryptfs to use kuid/kgid where appropriate 



Cc: Tyler Hicks <tyhicks@canonical.com>
Cc: Dustin Kirkland <dustin.kirkland@gazzang.com>
Acked-by: default avatarSerge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
parent a7d9cfe9

fs/ecryptfs/main.c

+3 −2
Original line number Diff line number Diff line
@@ -544,11 +544,12 @@ static struct dentry *ecryptfs_mount(struct file_system_type *fs_type, int flags 
		goto out_free;

	}



	if (check_ruid && path.dentry->d_inode->i_uid != current_uid()) {

	if (check_ruid && !uid_eq(path.dentry->d_inode->i_uid, current_uid())) {

		rc = -EPERM;

		printk(KERN_ERR "Mount of device (uid: %d) not owned by "

		       "requested user (uid: %d)\n",

		       path.dentry->d_inode->i_uid, current_uid());

			i_uid_read(path.dentry->d_inode),

			from_kuid(&init_user_ns, current_uid()));

		goto out_free;

	}

fs/ecryptfs/messaging.c

+2 −3
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ static struct hlist_head *ecryptfs_daemon_hash; 
struct mutex ecryptfs_daemon_hash_mux;

static int ecryptfs_hash_bits;

#define ecryptfs_current_euid_hash(uid) \

		hash_long((unsigned long)current_euid(), ecryptfs_hash_bits)

	hash_long((unsigned long)from_kuid(&init_user_ns, current_euid()), ecryptfs_hash_bits)



static u32 ecryptfs_msg_counter;

static struct ecryptfs_msg_ctx *ecryptfs_msg_ctx_arr;
@@ -121,8 +121,7 @@ int ecryptfs_find_daemon_by_euid(struct ecryptfs_daemon **daemon) 
	hlist_for_each_entry(*daemon, elem,

			    &ecryptfs_daemon_hash[ecryptfs_current_euid_hash()],

			    euid_chain) {

		if ((*daemon)->file->f_cred->euid == current_euid() &&

		    (*daemon)->file->f_cred->user_ns == current_user_ns()) {

		if (uid_eq((*daemon)->file->f_cred->euid, current_euid())) {

			rc = 0;

			goto out;

		}

init/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -941,7 +941,6 @@ config UIDGID_CONVERTED 
	depends on CEPH_FS = n

	depends on CIFS = n

	depends on CODA_FS = n

	depends on ECRYPT_FS = n

	depends on EFS_FS = n

	depends on EXOFS_FS = n

	depends on FUSE_FS = n