leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

userns: Convert ecryptfs to use kuid/kgid where appropriate

Browse Source 
Cc: Tyler Hicks <tyhicks@canonical.com>
Cc: Dustin Kirkland <dustin.kirkland@gazzang.com>
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
This commit is contained in:
Eric W. Biederman 2012-02-07 16:24:33 -08:00
parent a7d9cfe97b
commit cdf8c58a35
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/ecryptfs/main.c
View File

@ -544,11 +544,12 @@ static struct dentry *ecryptfs_mount(struct file_system_type *fs_type, int flags
goto out_free; 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; rc = -EPERM;
printk(KERN_ERR "Mount of device (uid: %d) not owned by " printk(KERN_ERR "Mount of device (uid: %d) not owned by "
"requested user (uid: %d)\n", "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; goto out_free;
} }

5
fs/ecryptfs/messaging.c
View File

@ -33,7 +33,7 @@ static struct hlist_head *ecryptfs_daemon_hash;
struct mutex ecryptfs_daemon_hash_mux; struct mutex ecryptfs_daemon_hash_mux;
static int ecryptfs_hash_bits; static int ecryptfs_hash_bits;
#define ecryptfs_current_euid_hash(uid) \ #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 u32 ecryptfs_msg_counter;
static struct ecryptfs_msg_ctx *ecryptfs_msg_ctx_arr; 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, hlist_for_each_entry(*daemon, elem,
&ecryptfs_daemon_hash[ecryptfs_current_euid_hash()], &ecryptfs_daemon_hash[ecryptfs_current_euid_hash()],
euid_chain) { euid_chain) {
if ((*daemon)->file->f_cred->euid == current_euid() && if (uid_eq((*daemon)->file->f_cred->euid, current_euid())) {
(*daemon)->file->f_cred->user_ns == current_user_ns()) {
rc = 0; rc = 0;
goto out; goto out;
} }

1
init/Kconfig
View File

@ -941,7 +941,6 @@ config UIDGID_CONVERTED
depends on CEPH_FS = n depends on CEPH_FS = n
depends on CIFS = n depends on CIFS = n
depends on CODA_FS = n depends on CODA_FS = n
depends on ECRYPT_FS = n
depends on EFS_FS = n depends on EFS_FS = n
depends on EXOFS_FS = n depends on EXOFS_FS = n
depends on FUSE_FS = n depends on FUSE_FS = n