Skip to content

L
linux
Commit bd1bfe40 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

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 ecryptfs_header_cache_2
  eCryptfs: Cleanup and optimize ecryptfs_lookup_interpose()
  eCryptfs: Return useful code from contains_ecryptfs_marker
  eCryptfs: Fix new inode race condition
  eCryptfs: Cleanup inode initialization code
  eCryptfs: Consolidate inode functions into inode.c
parents cd1acdf1 30632870
Show whitespace changes
Inline Side-by-side
Showing with 220 additions and 263 deletions
fs/ecryptfs/crypto.c
View file @ bd1bfe40
...@@ -1024,25 +1024,25 @@ int ecryptfs_new_file_context(struct dentry *ecryptfs_dentry) ...@@ -1024,25 +1024,25 @@ int ecryptfs_new_file_context(struct dentry *ecryptfs_dentry)
} }
/** /**
* contains_ecryptfs_marker - check for the ecryptfs marker * ecryptfs_validate_marker - check for the ecryptfs marker
* @data: The data block in which to check * @data: The data block in which to check
* *
* Returns one if marker found; zero if not found * Returns zero if marker found; -EINVAL if not found
*/ */
static int contains_ecryptfs_marker(char *data) static int ecryptfs_validate_marker(char *data)
{ {
u32 m_1, m_2; u32 m_1, m_2;
m_1 = get_unaligned_be32(data); m_1 = get_unaligned_be32(data);
m_2 = get_unaligned_be32(data + 4); m_2 = get_unaligned_be32(data + 4);
if ((m_1 ^ MAGIC_ECRYPTFS_MARKER) == m_2) if ((m_1 ^ MAGIC_ECRYPTFS_MARKER) == m_2)
return 1; return 0;
ecryptfs_printk(KERN_DEBUG, "m_1 = [0x%.8x]; m_2 = [0x%.8x]; " ecryptfs_printk(KERN_DEBUG, "m_1 = [0x%.8x]; m_2 = [0x%.8x]; "
"MAGIC_ECRYPTFS_MARKER = [0x%.8x]\n", m_1, m_2, "MAGIC_ECRYPTFS_MARKER = [0x%.8x]\n", m_1, m_2,
MAGIC_ECRYPTFS_MARKER); MAGIC_ECRYPTFS_MARKER);
ecryptfs_printk(KERN_DEBUG, "(m_1 ^ MAGIC_ECRYPTFS_MARKER) = " ecryptfs_printk(KERN_DEBUG, "(m_1 ^ MAGIC_ECRYPTFS_MARKER) = "
"[0x%.8x]\n", (m_1 ^ MAGIC_ECRYPTFS_MARKER)); "[0x%.8x]\n", (m_1 ^ MAGIC_ECRYPTFS_MARKER));
return 0; return -EINVAL;
} }
struct ecryptfs_flag_map_elem { struct ecryptfs_flag_map_elem {
...@@ -1201,27 +1201,19 @@ int ecryptfs_cipher_code_to_string(char *str, u8 cipher_code) ...@@ -1201,27 +1201,19 @@ int ecryptfs_cipher_code_to_string(char *str, u8 cipher_code)
return rc; return rc;
} }
int ecryptfs_read_and_validate_header_region(char *data, int ecryptfs_read_and_validate_header_region(struct inode *inode)
struct inode *ecryptfs_inode)
{ {
struct ecryptfs_crypt_stat *crypt_stat = u8 file_size[ECRYPTFS_SIZE_AND_MARKER_BYTES];
&(ecryptfs_inode_to_private(ecryptfs_inode)->crypt_stat); u8 *marker = file_size + ECRYPTFS_FILE_SIZE_BYTES;
int rc; int rc;
if (crypt_stat->extent_size == 0) rc = ecryptfs_read_lower(file_size, 0, ECRYPTFS_SIZE_AND_MARKER_BYTES,
crypt_stat->extent_size = ECRYPTFS_DEFAULT_EXTENT_SIZE; inode);
rc = ecryptfs_read_lower(data, 0, crypt_stat->extent_size, if (rc < ECRYPTFS_SIZE_AND_MARKER_BYTES)
ecryptfs_inode); return rc >= 0 ? -EINVAL : rc;
if (rc < 0) { rc = ecryptfs_validate_marker(marker);
printk(KERN_ERR "%s: Error reading header region; rc = [%d]\n", if (!rc)
__func__, rc); ecryptfs_i_size_init(file_size, inode);
goto out;
}
if (!contains_ecryptfs_marker(data + ECRYPTFS_FILE_SIZE_BYTES)) {
rc = -EINVAL;
} else
rc = 0;
out:
return rc; return rc;
} }
...@@ -1242,8 +1234,7 @@ ecryptfs_write_header_metadata(char *virt, ...@@ -1242,8 +1234,7 @@ ecryptfs_write_header_metadata(char *virt,
(*written) = 6; (*written) = 6;
} }
struct kmem_cache *ecryptfs_header_cache_1; struct kmem_cache *ecryptfs_header_cache;
struct kmem_cache *ecryptfs_header_cache_2;
/** /**
* ecryptfs_write_headers_virt * ecryptfs_write_headers_virt
...@@ -1496,11 +1487,9 @@ static int ecryptfs_read_headers_virt(char *page_virt, ...@@ -1496,11 +1487,9 @@ static int ecryptfs_read_headers_virt(char *page_virt,
crypt_stat->mount_crypt_stat = &ecryptfs_superblock_to_private( crypt_stat->mount_crypt_stat = &ecryptfs_superblock_to_private(
ecryptfs_dentry->d_sb)->mount_crypt_stat; ecryptfs_dentry->d_sb)->mount_crypt_stat;
offset = ECRYPTFS_FILE_SIZE_BYTES; offset = ECRYPTFS_FILE_SIZE_BYTES;
rc = contains_ecryptfs_marker(page_virt + offset); rc = ecryptfs_validate_marker(page_virt + offset);
if (rc == 0) { if (rc)
rc = -EINVAL;
goto out; goto out;
}
if (!(crypt_stat->flags & ECRYPTFS_I_SIZE_INITIALIZED)) if (!(crypt_stat->flags & ECRYPTFS_I_SIZE_INITIALIZED))
ecryptfs_i_size_init(page_virt, ecryptfs_dentry->d_inode); ecryptfs_i_size_init(page_virt, ecryptfs_dentry->d_inode);
offset += MAGIC_ECRYPTFS_MARKER_SIZE_BYTES; offset += MAGIC_ECRYPTFS_MARKER_SIZE_BYTES;
...@@ -1567,20 +1556,21 @@ int ecryptfs_read_xattr_region(char *page_virt, struct inode *ecryptfs_inode) ...@@ -1567,20 +1556,21 @@ int ecryptfs_read_xattr_region(char *page_virt, struct inode *ecryptfs_inode)
return rc; return rc;
} }
int ecryptfs_read_and_validate_xattr_region(char *page_virt, int ecryptfs_read_and_validate_xattr_region(struct dentry *dentry,
struct dentry *ecryptfs_dentry) struct inode *inode)
{ {
u8 file_size[ECRYPTFS_SIZE_AND_MARKER_BYTES];
u8 *marker = file_size + ECRYPTFS_FILE_SIZE_BYTES;
int rc; int rc;
rc = ecryptfs_read_xattr_region(page_virt, ecryptfs_dentry->d_inode); rc = ecryptfs_getxattr_lower(ecryptfs_dentry_to_lower(dentry),
if (rc) ECRYPTFS_XATTR_NAME, file_size,
goto out; ECRYPTFS_SIZE_AND_MARKER_BYTES);
if (!contains_ecryptfs_marker(page_virt + ECRYPTFS_FILE_SIZE_BYTES)) { if (rc < ECRYPTFS_SIZE_AND_MARKER_BYTES)
printk(KERN_WARNING "Valid data found in [%s] xattr, but " return rc >= 0 ? -EINVAL : rc;
"the marker is invalid\n", ECRYPTFS_XATTR_NAME); rc = ecryptfs_validate_marker(marker);
rc = -EINVAL; if (!rc)
} ecryptfs_i_size_init(file_size, inode);
out:
return rc; return rc;
} }
...@@ -1610,7 +1600,7 @@ int ecryptfs_read_metadata(struct dentry *ecryptfs_dentry) ...@@ -1610,7 +1600,7 @@ int ecryptfs_read_metadata(struct dentry *ecryptfs_dentry)
ecryptfs_copy_mount_wide_flags_to_inode_flags(crypt_stat, ecryptfs_copy_mount_wide_flags_to_inode_flags(crypt_stat,
mount_crypt_stat); mount_crypt_stat);
/* Read the first page from the underlying file */ /* Read the first page from the underlying file */
page_virt = kmem_cache_alloc(ecryptfs_header_cache_1, GFP_USER); page_virt = kmem_cache_alloc(ecryptfs_header_cache, GFP_USER);
if (!page_virt) { if (!page_virt) {
rc = -ENOMEM; rc = -ENOMEM;
printk(KERN_ERR "%s: Unable to allocate page_virt\n", printk(KERN_ERR "%s: Unable to allocate page_virt\n",
...@@ -1655,7 +1645,7 @@ int ecryptfs_read_metadata(struct dentry *ecryptfs_dentry) ...@@ -1655,7 +1645,7 @@ int ecryptfs_read_metadata(struct dentry *ecryptfs_dentry)
out: out:
if (page_virt) { if (page_virt) {
memset(page_virt, 0, PAGE_CACHE_SIZE); memset(page_virt, 0, PAGE_CACHE_SIZE);
kmem_cache_free(ecryptfs_header_cache_1, page_virt); kmem_cache_free(ecryptfs_header_cache, page_virt);
} }
return rc; return rc;
} }
......
fs/ecryptfs/ecryptfs_kernel.h
View file @ bd1bfe40
...@@ -200,6 +200,8 @@ ecryptfs_get_key_payload_data(struct key *key) ...@@ -200,6 +200,8 @@ ecryptfs_get_key_payload_data(struct key *key)
#define MAGIC_ECRYPTFS_MARKER 0x3c81b7f5 #define MAGIC_ECRYPTFS_MARKER 0x3c81b7f5
#define MAGIC_ECRYPTFS_MARKER_SIZE_BYTES 8 /* 4*2 */ #define MAGIC_ECRYPTFS_MARKER_SIZE_BYTES 8 /* 4*2 */
#define ECRYPTFS_FILE_SIZE_BYTES (sizeof(u64)) #define ECRYPTFS_FILE_SIZE_BYTES (sizeof(u64))
#define ECRYPTFS_SIZE_AND_MARKER_BYTES (ECRYPTFS_FILE_SIZE_BYTES \
+ MAGIC_ECRYPTFS_MARKER_SIZE_BYTES)
#define ECRYPTFS_DEFAULT_CIPHER "aes" #define ECRYPTFS_DEFAULT_CIPHER "aes"
#define ECRYPTFS_DEFAULT_KEY_BYTES 16 #define ECRYPTFS_DEFAULT_KEY_BYTES 16
#define ECRYPTFS_DEFAULT_HASH "md5" #define ECRYPTFS_DEFAULT_HASH "md5"
...@@ -603,8 +605,7 @@ extern struct kmem_cache *ecryptfs_file_info_cache; ...@@ -603,8 +605,7 @@ extern struct kmem_cache *ecryptfs_file_info_cache;
extern struct kmem_cache *ecryptfs_dentry_info_cache; extern struct kmem_cache *ecryptfs_dentry_info_cache;
extern struct kmem_cache *ecryptfs_inode_info_cache; extern struct kmem_cache *ecryptfs_inode_info_cache;
extern struct kmem_cache *ecryptfs_sb_info_cache; extern struct kmem_cache *ecryptfs_sb_info_cache;
extern struct kmem_cache *ecryptfs_header_cache_1; extern struct kmem_cache *ecryptfs_header_cache;
extern struct kmem_cache *ecryptfs_header_cache_2;
extern struct kmem_cache *ecryptfs_xattr_cache; extern struct kmem_cache *ecryptfs_xattr_cache;
extern struct kmem_cache *ecryptfs_key_record_cache; extern struct kmem_cache *ecryptfs_key_record_cache;
extern struct kmem_cache *ecryptfs_key_sig_cache; extern struct kmem_cache *ecryptfs_key_sig_cache;
...@@ -625,14 +626,9 @@ struct ecryptfs_open_req { ...@@ -625,14 +626,9 @@ struct ecryptfs_open_req {
struct list_head kthread_ctl_list; struct list_head kthread_ctl_list;
}; };
#define ECRYPTFS_INTERPOSE_FLAG_D_ADD 0x00000001 struct inode *ecryptfs_get_inode(struct inode *lower_inode,
int ecryptfs_interpose(struct dentry *hidden_dentry, struct super_block *sb);
struct dentry *this_dentry, struct super_block *sb,
u32 flags);
void ecryptfs_i_size_init(const char *page_virt, struct inode *inode); void ecryptfs_i_size_init(const char *page_virt, struct inode *inode);
int ecryptfs_lookup_and_interpose_lower(struct dentry *ecryptfs_dentry,
struct dentry *lower_dentry,
struct inode *ecryptfs_dir_inode);
int ecryptfs_decode_and_decrypt_filename(char **decrypted_name, int ecryptfs_decode_and_decrypt_filename(char **decrypted_name,
size_t *decrypted_name_size, size_t *decrypted_name_size,
struct dentry *ecryptfs_dentry, struct dentry *ecryptfs_dentry,
...@@ -664,10 +660,9 @@ int ecryptfs_new_file_context(struct dentry *ecryptfs_dentry); ...@@ -664,10 +660,9 @@ int ecryptfs_new_file_context(struct dentry *ecryptfs_dentry);
void ecryptfs_write_crypt_stat_flags(char *page_virt, void ecryptfs_write_crypt_stat_flags(char *page_virt,
struct ecryptfs_crypt_stat *crypt_stat, struct ecryptfs_crypt_stat *crypt_stat,
size_t *written); size_t *written);
int ecryptfs_read_and_validate_header_region(char *data, int ecryptfs_read_and_validate_header_region(struct inode *inode);
struct inode *ecryptfs_inode); int ecryptfs_read_and_validate_xattr_region(struct dentry *dentry,
int ecryptfs_read_and_validate_xattr_region(char *page_virt, struct inode *inode);
struct dentry *ecryptfs_dentry);
u8 ecryptfs_code_for_cipher_string(char *cipher_name, size_t key_bytes); u8 ecryptfs_code_for_cipher_string(char *cipher_name, size_t key_bytes);
int ecryptfs_cipher_code_to_string(char *str, u8 cipher_code); int ecryptfs_cipher_code_to_string(char *str, u8 cipher_code);
void ecryptfs_set_default_sizes(struct ecryptfs_crypt_stat *crypt_stat); void ecryptfs_set_default_sizes(struct ecryptfs_crypt_stat *crypt_stat);
...@@ -679,9 +674,6 @@ int ...@@ -679,9 +674,6 @@ int
ecryptfs_parse_packet_set(struct ecryptfs_crypt_stat *crypt_stat, ecryptfs_parse_packet_set(struct ecryptfs_crypt_stat *crypt_stat,
unsigned char *src, struct dentry *ecryptfs_dentry); unsigned char *src, struct dentry *ecryptfs_dentry);
int ecryptfs_truncate(struct dentry *dentry, loff_t new_length); int ecryptfs_truncate(struct dentry *dentry, loff_t new_length);
int ecryptfs_inode_test(struct inode *inode, void *candidate_lower_inode);
int ecryptfs_inode_set(struct inode *inode, void *lower_inode);
void ecryptfs_init_inode(struct inode *inode, struct inode *lower_inode);
ssize_t ssize_t
ecryptfs_getxattr_lower(struct dentry *lower_dentry, const char *name, ecryptfs_getxattr_lower(struct dentry *lower_dentry, const char *name,
void *value, size_t size); void *value, size_t size);
...@@ -761,7 +753,7 @@ int ecryptfs_privileged_open(struct file **lower_file, ...@@ -761,7 +753,7 @@ int ecryptfs_privileged_open(struct file **lower_file,
struct dentry *lower_dentry, struct dentry *lower_dentry,
struct vfsmount *lower_mnt, struct vfsmount *lower_mnt,
const struct cred *cred); const struct cred *cred);
int ecryptfs_get_lower_file(struct dentry *ecryptfs_dentry); int ecryptfs_get_lower_file(struct dentry *dentry, struct inode *inode);
void ecryptfs_put_lower_file(struct inode *inode); void ecryptfs_put_lower_file(struct inode *inode);
int int
ecryptfs_write_tag_70_packet(char *dest, size_t *remaining_bytes, ecryptfs_write_tag_70_packet(char *dest, size_t *remaining_bytes,
......
fs/ecryptfs/file.c
View file @ bd1bfe40
...@@ -191,7 +191,7 @@ static int ecryptfs_open(struct inode *inode, struct file *file) ...@@ -191,7 +191,7 @@ static int ecryptfs_open(struct inode *inode, struct file *file)
| ECRYPTFS_ENCRYPTED); | ECRYPTFS_ENCRYPTED);
} }
mutex_unlock(&crypt_stat->cs_mutex); mutex_unlock(&crypt_stat->cs_mutex);
rc = ecryptfs_get_lower_file(ecryptfs_dentry); rc = ecryptfs_get_lower_file(ecryptfs_dentry, inode);
if (rc) { if (rc) {
printk(KERN_ERR "%s: Error attempting to initialize " printk(KERN_ERR "%s: Error attempting to initialize "
"the lower file for the dentry with name " "the lower file for the dentry with name "
......
fs/ecryptfs/inode.c
View file @ bd1bfe40
...@@ -51,6 +51,97 @@ static void unlock_dir(struct dentry *dir) ...@@ -51,6 +51,97 @@ static void unlock_dir(struct dentry *dir)
dput(dir); dput(dir);
} }
static int ecryptfs_inode_test(struct inode *inode, void *lower_inode)
{
if (ecryptfs_inode_to_lower(inode) == (struct inode *)lower_inode)
return 1;
return 0;
}
static int ecryptfs_inode_set(struct inode *inode, void *opaque)
{
struct inode *lower_inode = opaque;
ecryptfs_set_inode_lower(inode, lower_inode);
fsstack_copy_attr_all(inode, lower_inode);
/* i_size will be overwritten for encrypted regular files */
fsstack_copy_inode_size(inode, lower_inode);
inode->i_ino = lower_inode->i_ino;
inode->i_version++;
inode->i_mapping->a_ops = &ecryptfs_aops;
if (S_ISLNK(inode->i_mode))
inode->i_op = &ecryptfs_symlink_iops;
else if (S_ISDIR(inode->i_mode))
inode->i_op = &ecryptfs_dir_iops;
else
inode->i_op = &ecryptfs_main_iops;
if (S_ISDIR(inode->i_mode))
inode->i_fop = &ecryptfs_dir_fops;
else if (special_file(inode->i_mode))
init_special_inode(inode, inode->i_mode, inode->i_rdev);
else
inode->i_fop = &ecryptfs_main_fops;
return 0;
}
static struct inode *__ecryptfs_get_inode(struct inode *lower_inode,
struct super_block *sb)
{
struct inode *inode;
if (lower_inode->i_sb != ecryptfs_superblock_to_lower(sb))
return ERR_PTR(-EXDEV);
if (!igrab(lower_inode))
return ERR_PTR(-ESTALE);
inode = iget5_locked(sb, (unsigned long)lower_inode,
ecryptfs_inode_test, ecryptfs_inode_set,
lower_inode);
if (!inode) {
iput(lower_inode);
return ERR_PTR(-EACCES);
}
if (!(inode->i_state & I_NEW))
iput(lower_inode);
return inode;
}
struct inode *ecryptfs_get_inode(struct inode *lower_inode,
struct super_block *sb)
{
struct inode *inode = __ecryptfs_get_inode(lower_inode, sb);
if (!IS_ERR(inode) && (inode->i_state & I_NEW))
unlock_new_inode(inode);
return inode;
}
/**
* ecryptfs_interpose
* @lower_dentry: Existing dentry in the lower filesystem
* @dentry: ecryptfs' dentry
* @sb: ecryptfs's super_block
*
* Interposes upper and lower dentries.
*
* Returns zero on success; non-zero otherwise
*/
static int ecryptfs_interpose(struct dentry *lower_dentry,
struct dentry *dentry, struct super_block *sb)
{
struct inode *inode = ecryptfs_get_inode(lower_dentry->d_inode, sb);
if (IS_ERR(inode))
return PTR_ERR(inode);
d_instantiate(dentry, inode);
return 0;
}
/** /**
* ecryptfs_create_underlying_file * ecryptfs_create_underlying_file
* @lower_dir_inode: inode of the parent in the lower fs of the new file * @lower_dir_inode: inode of the parent in the lower fs of the new file
...@@ -129,7 +220,7 @@ ecryptfs_do_create(struct inode *directory_inode, ...@@ -129,7 +220,7 @@ ecryptfs_do_create(struct inode *directory_inode,
goto out_lock; goto out_lock;
} }
rc = ecryptfs_interpose(lower_dentry, ecryptfs_dentry, rc = ecryptfs_interpose(lower_dentry, ecryptfs_dentry,
directory_inode->i_sb, 0); directory_inode->i_sb);
if (rc) { if (rc) {
ecryptfs_printk(KERN_ERR, "Failure in ecryptfs_interpose\n"); ecryptfs_printk(KERN_ERR, "Failure in ecryptfs_interpose\n");
goto out_lock; goto out_lock;
...@@ -168,7 +259,8 @@ static int ecryptfs_initialize_file(struct dentry *ecryptfs_dentry) ...@@ -168,7 +259,8 @@ static int ecryptfs_initialize_file(struct dentry *ecryptfs_dentry)
"context; rc = [%d]\n", rc); "context; rc = [%d]\n", rc);
goto out; goto out;
} }
rc = ecryptfs_get_lower_file(ecryptfs_dentry); rc = ecryptfs_get_lower_file(ecryptfs_dentry,
ecryptfs_dentry->d_inode);
if (rc) { if (rc) {
printk(KERN_ERR "%s: Error attempting to initialize " printk(KERN_ERR "%s: Error attempting to initialize "
"the lower file for the dentry with name " "the lower file for the dentry with name "
...@@ -215,102 +307,90 @@ ecryptfs_create(struct inode *directory_inode, struct dentry *ecryptfs_dentry, ...@@ -215,102 +307,90 @@ ecryptfs_create(struct inode *directory_inode, struct dentry *ecryptfs_dentry,
return rc; return rc;
} }
static int ecryptfs_i_size_read(struct dentry *dentry, struct inode *inode)
{
struct ecryptfs_crypt_stat *crypt_stat;
int rc;
rc = ecryptfs_get_lower_file(dentry, inode);
if (rc) {
printk(KERN_ERR "%s: Error attempting to initialize "
"the lower file for the dentry with name "
"[%s]; rc = [%d]\n", __func__,
dentry->d_name.name, rc);
return rc;
}
crypt_stat = &ecryptfs_inode_to_private(inode)->crypt_stat;
/* TODO: lock for crypt_stat comparison */
if (!(crypt_stat->flags & ECRYPTFS_POLICY_APPLIED))
ecryptfs_set_default_sizes(crypt_stat);
rc = ecryptfs_read_and_validate_header_region(inode);
ecryptfs_put_lower_file(inode);
if (rc) {
rc = ecryptfs_read_and_validate_xattr_region(dentry, inode);
if (!rc)
crypt_stat->flags |= ECRYPTFS_METADATA_IN_XATTR;
}
/* Must return 0 to allow non-eCryptfs files to be looked up, too */
return 0;
}
/** /**
* ecryptfs_lookup_and_interpose_lower - Perform a lookup * ecryptfs_lookup_interpose - Dentry interposition for a lookup
*/ */
int ecryptfs_lookup_and_interpose_lower(struct dentry *ecryptfs_dentry, static int ecryptfs_lookup_interpose(struct dentry *dentry,
struct dentry *lower_dentry, struct dentry *lower_dentry,
struct inode *ecryptfs_dir_inode) struct inode *dir_inode)
{ {
struct dentry *lower_dir_dentry; struct inode *inode, *lower_inode = lower_dentry->d_inode;
struct ecryptfs_dentry_info *dentry_info;
struct vfsmount *lower_mnt; struct vfsmount *lower_mnt;
struct inode *lower_inode; int rc = 0;
struct ecryptfs_crypt_stat *crypt_stat;
char *page_virt = NULL; lower_mnt = mntget(ecryptfs_dentry_to_lower_mnt(dentry->d_parent));
int put_lower = 0, rc = 0; fsstack_copy_attr_atime(dir_inode, lower_dentry->d_parent->d_inode);
lower_dir_dentry = lower_dentry->d_parent;
lower_mnt = mntget(ecryptfs_dentry_to_lower_mnt(
ecryptfs_dentry->d_parent));
lower_inode = lower_dentry->d_inode;
fsstack_copy_attr_atime(ecryptfs_dir_inode, lower_dir_dentry->d_inode);
BUG_ON(!lower_dentry->d_count); BUG_ON(!lower_dentry->d_count);
ecryptfs_set_dentry_private(ecryptfs_dentry,
kmem_cache_alloc(ecryptfs_dentry_info_cache, dentry_info = kmem_cache_alloc(ecryptfs_dentry_info_cache, GFP_KERNEL);
GFP_KERNEL)); ecryptfs_set_dentry_private(dentry, dentry_info);
if (!ecryptfs_dentry_to_private(ecryptfs_dentry)) { if (!dentry_info) {
rc = -ENOMEM;
printk(KERN_ERR "%s: Out of memory whilst attempting " printk(KERN_ERR "%s: Out of memory whilst attempting "
"to allocate ecryptfs_dentry_info struct\n", "to allocate ecryptfs_dentry_info struct\n",
__func__); __func__);
goto out_put; dput(lower_dentry);
mntput(lower_mnt);
d_drop(dentry);
return -ENOMEM;
} }
ecryptfs_set_dentry_lower(ecryptfs_dentry, lower_dentry); ecryptfs_set_dentry_lower(dentry, lower_dentry);
ecryptfs_set_dentry_lower_mnt(ecryptfs_dentry, lower_mnt); ecryptfs_set_dentry_lower_mnt(dentry, lower_mnt);
if (!lower_dentry->d_inode) { if (!lower_dentry->d_inode) {
/* We want to add because we couldn't find in lower */ /* We want to add because we couldn't find in lower */
d_add(ecryptfs_dentry, NULL); d_add(dentry, NULL);
goto out; return 0;
} }
rc = ecryptfs_interpose(lower_dentry, ecryptfs_dentry, inode = __ecryptfs_get_inode(lower_inode, dir_inode->i_sb);
ecryptfs_dir_inode->i_sb, if (IS_ERR(inode)) {
ECRYPTFS_INTERPOSE_FLAG_D_ADD); printk(KERN_ERR "%s: Error interposing; rc = [%ld]\n",
if (rc) { __func__, PTR_ERR(inode));
printk(KERN_ERR "%s: Error interposing; rc = [%d]\n", return PTR_ERR(inode);
__func__, rc);
goto out;
} }
if (S_ISDIR(lower_inode->i_mode)) if (S_ISREG(inode->i_mode)) {
goto out; rc = ecryptfs_i_size_read(dentry, inode);
if (S_ISLNK(lower_inode->i_mode))
goto out;
if (special_file(lower_inode->i_mode))
goto out;
/* Released in this function */
page_virt = kmem_cache_zalloc(ecryptfs_header_cache_2, GFP_USER);
if (!page_virt) {
printk(KERN_ERR "%s: Cannot kmem_cache_zalloc() a page\n",
__func__);
rc = -ENOMEM;
goto out;
}
rc = ecryptfs_get_lower_file(ecryptfs_dentry);
if (rc) {
printk(KERN_ERR "%s: Error attempting to initialize "
"the lower file for the dentry with name "
"[%s]; rc = [%d]\n", __func__,
ecryptfs_dentry->d_name.name, rc);
goto out_free_kmem;
}
put_lower = 1;
crypt_stat = &ecryptfs_inode_to_private(
ecryptfs_dentry->d_inode)->crypt_stat;
/* TODO: lock for crypt_stat comparison */
if (!(crypt_stat->flags & ECRYPTFS_POLICY_APPLIED))
ecryptfs_set_default_sizes(crypt_stat);
rc = ecryptfs_read_and_validate_header_region(page_virt,
ecryptfs_dentry->d_inode);
if (rc) {
memset(page_virt, 0, PAGE_CACHE_SIZE);
rc = ecryptfs_read_and_validate_xattr_region(page_virt,
ecryptfs_dentry);
if (rc) { if (rc) {
rc = 0; make_bad_inode(inode);
goto out_free_kmem; return rc;
} }
crypt_stat->flags |= ECRYPTFS_METADATA_IN_XATTR;
} }
ecryptfs_i_size_init(page_virt, ecryptfs_dentry->d_inode);
out_free_kmem: if (inode->i_state & I_NEW)
kmem_cache_free(ecryptfs_header_cache_2, page_virt); unlock_new_inode(inode);
goto out; d_add(dentry, inode);
out_put:
dput(lower_dentry);
mntput(lower_mnt);
d_drop(ecryptfs_dentry);
out:
if (put_lower)
ecryptfs_put_lower_file(ecryptfs_dentry->d_inode);
return rc; return rc;
} }
...@@ -353,12 +433,12 @@ static struct dentry *ecryptfs_lookup(struct inode *ecryptfs_dir_inode, ...@@ -353,12 +433,12 @@ static struct dentry *ecryptfs_lookup(struct inode *ecryptfs_dir_inode,
goto out_d_drop; goto out_d_drop;
} }
if (lower_dentry->d_inode) if (lower_dentry->d_inode)
goto lookup_and_interpose; goto interpose;
mount_crypt_stat = &ecryptfs_superblock_to_private( mount_crypt_stat = &ecryptfs_superblock_to_private(
ecryptfs_dentry->d_sb)->mount_crypt_stat; ecryptfs_dentry->d_sb)->mount_crypt_stat;
if (!(mount_crypt_stat if (!(mount_crypt_stat
&& (mount_crypt_stat->flags & ECRYPTFS_GLOBAL_ENCRYPT_FILENAMES))) && (mount_crypt_stat->flags & ECRYPTFS_GLOBAL_ENCRYPT_FILENAMES)))
goto lookup_and_interpose; goto interpose;
dput(lower_dentry); dput(lower_dentry);
rc = ecryptfs_encrypt_and_encode_filename( rc = ecryptfs_encrypt_and_encode_filename(
&encrypted_and_encoded_name, &encrypted_and_encoded_name_size, &encrypted_and_encoded_name, &encrypted_and_encoded_name_size,
...@@ -381,8 +461,8 @@ static struct dentry *ecryptfs_lookup(struct inode *ecryptfs_dir_inode, ...@@ -381,8 +461,8 @@ static struct dentry *ecryptfs_lookup(struct inode *ecryptfs_dir_inode,
encrypted_and_encoded_name); encrypted_and_encoded_name);
goto out_d_drop; goto out_d_drop;
} }
lookup_and_interpose: interpose:
rc = ecryptfs_lookup_and_interpose_lower(ecryptfs_dentry, lower_dentry, rc = ecryptfs_lookup_interpose(ecryptfs_dentry, lower_dentry,
ecryptfs_dir_inode); ecryptfs_dir_inode);
goto out; goto out;
out_d_drop: out_d_drop:
...@@ -411,7 +491,7 @@ static int ecryptfs_link(struct dentry *old_dentry, struct inode *dir, ...@@ -411,7 +491,7 @@ static int ecryptfs_link(struct dentry *old_dentry, struct inode *dir,
lower_new_dentry); lower_new_dentry);
if (rc || !lower_new_dentry->d_inode) if (rc || !lower_new_dentry->d_inode)
goto out_lock; goto out_lock;
rc = ecryptfs_interpose(lower_new_dentry, new_dentry, dir->i_sb, 0); rc = ecryptfs_interpose(lower_new_dentry, new_dentry, dir->i_sb);
if (rc) if (rc)
goto out_lock; goto out_lock;
fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode); fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode);
...@@ -478,7 +558,7 @@ static int ecryptfs_symlink(struct inode *dir, struct dentry *dentry, ...@@ -478,7 +558,7 @@ static int ecryptfs_symlink(struct inode *dir, struct dentry *dentry,
kfree(encoded_symname); kfree(encoded_symname);
if (rc || !lower_dentry->d_inode) if (rc || !lower_dentry->d_inode)
goto out_lock; goto out_lock;
rc = ecryptfs_interpose(lower_dentry, dentry, dir->i_sb, 0); rc = ecryptfs_interpose(lower_dentry, dentry, dir->i_sb);
if (rc) if (rc)
goto out_lock; goto out_lock;
fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode); fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode);
...@@ -502,7 +582,7 @@ static int ecryptfs_mkdir(struct inode *dir, struct dentry *dentry, int mode) ...@@ -502,7 +582,7 @@ static int ecryptfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
rc = vfs_mkdir(lower_dir_dentry->d_inode, lower_dentry, mode); rc = vfs_mkdir(lower_dir_dentry->d_inode, lower_dentry, mode);
if (rc || !lower_dentry->d_inode) if (rc || !lower_dentry->d_inode)
goto out; goto out;
rc = ecryptfs_interpose(lower_dentry, dentry, dir->i_sb, 0); rc = ecryptfs_interpose(lower_dentry, dentry, dir->i_sb);
if (rc) if (rc)
goto out; goto out;
fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode); fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode);
...@@ -550,7 +630,7 @@ ecryptfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev) ...@@ -550,7 +630,7 @@ ecryptfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
rc = vfs_mknod(lower_dir_dentry->d_inode, lower_dentry, mode, dev); rc = vfs_mknod(lower_dir_dentry->d_inode, lower_dentry, mode, dev);
if (rc || !lower_dentry->d_inode) if (rc || !lower_dentry->d_inode)
goto out; goto out;
rc = ecryptfs_interpose(lower_dentry, dentry, dir->i_sb, 0); rc = ecryptfs_interpose(lower_dentry, dentry, dir->i_sb);
if (rc) if (rc)
goto out; goto out;
fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode); fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode);
...@@ -750,7 +830,7 @@ static int truncate_upper(struct dentry *dentry, struct iattr *ia, ...@@ -750,7 +830,7 @@ static int truncate_upper(struct dentry *dentry, struct iattr *ia,
lower_ia->ia_valid &= ~ATTR_SIZE; lower_ia->ia_valid &= ~ATTR_SIZE;
return 0; return 0;
} }
rc = ecryptfs_get_lower_file(dentry); rc = ecryptfs_get_lower_file(dentry, inode);
if (rc) if (rc)
return rc; return rc;
crypt_stat = &ecryptfs_inode_to_private(dentry->d_inode)->crypt_stat; crypt_stat = &ecryptfs_inode_to_private(dentry->d_inode)->crypt_stat;
...@@ -906,7 +986,7 @@ static int ecryptfs_setattr(struct dentry *dentry, struct iattr *ia) ...@@ -906,7 +986,7 @@ static int ecryptfs_setattr(struct dentry *dentry, struct iattr *ia)
mount_crypt_stat = &ecryptfs_superblock_to_private( mount_crypt_stat = &ecryptfs_superblock_to_private(
dentry->d_sb)->mount_crypt_stat; dentry->d_sb)->mount_crypt_stat;
rc = ecryptfs_get_lower_file(dentry); rc = ecryptfs_get_lower_file(dentry, inode);
if (rc) { if (rc) {
mutex_unlock(&crypt_stat->cs_mutex); mutex_unlock(&crypt_stat->cs_mutex);
goto out; goto out;
...@@ -1079,21 +1159,6 @@ static int ecryptfs_removexattr(struct dentry *dentry, const char *name) ...@@ -1079,21 +1159,6 @@ static int ecryptfs_removexattr(struct dentry *dentry, const char *name)
return rc; return rc;
} }
int ecryptfs_inode_test(struct inode *inode, void *candidate_lower_inode)
{
if ((ecryptfs_inode_to_lower(inode)
== (struct inode *)candidate_lower_inode))
return 1;
else
return 0;
}
int ecryptfs_inode_set(struct inode *inode, void *lower_inode)
{
ecryptfs_init_inode(inode, (struct inode *)lower_inode);
return 0;
}
const struct inode_operations ecryptfs_symlink_iops = { const struct inode_operations ecryptfs_symlink_iops = {
.readlink = ecryptfs_readlink, .readlink = ecryptfs_readlink,
.follow_link = ecryptfs_follow_link, .follow_link = ecryptfs_follow_link,
......
fs/ecryptfs/main.c
View file @ bd1bfe40
...@@ -135,12 +135,12 @@ static int ecryptfs_init_lower_file(struct dentry *dentry, ...@@ -135,12 +135,12 @@ static int ecryptfs_init_lower_file(struct dentry *dentry,
return rc; return rc;
} }
int ecryptfs_get_lower_file(struct dentry *dentry) int ecryptfs_get_lower_file(struct dentry *dentry, struct inode *inode)
{ {
struct ecryptfs_inode_info *inode_info = struct ecryptfs_inode_info *inode_info;
ecryptfs_inode_to_private(dentry->d_inode);
int count, rc = 0; int count, rc = 0;
inode_info = ecryptfs_inode_to_private(inode);
mutex_lock(&inode_info->lower_file_mutex); mutex_lock(&inode_info->lower_file_mutex);
count = atomic_inc_return(&inode_info->lower_file_count); count = atomic_inc_return(&inode_info->lower_file_count);
if (WARN_ON_ONCE(count < 1)) if (WARN_ON_ONCE(count < 1))
...@@ -168,75 +168,6 @@ void ecryptfs_put_lower_file(struct inode *inode) ...@@ -168,75 +168,6 @@ void ecryptfs_put_lower_file(struct inode *inode)
} }
} }
static struct inode *ecryptfs_get_inode(struct inode *lower_inode,
struct super_block *sb)
{
struct inode *inode;
int rc = 0;
if (lower_inode->i_sb != ecryptfs_superblock_to_lower(sb)) {
rc = -EXDEV;
goto out;
}
if (!igrab(lower_inode)) {
rc = -ESTALE;
goto out;
}
inode = iget5_locked(sb, (unsigned long)lower_inode,
ecryptfs_inode_test, ecryptfs_inode_set,
lower_inode);
if (!inode) {
rc = -EACCES;
iput(lower_inode);
goto out;
}
if (inode->i_state & I_NEW)
unlock_new_inode(inode);
else
iput(lower_inode);
if (S_ISLNK(lower_inode->i_mode))
inode->i_op = &ecryptfs_symlink_iops;
else if (S_ISDIR(lower_inode->i_mode))
inode->i_op = &ecryptfs_dir_iops;
if (S_ISDIR(lower_inode->i_mode))
inode->i_fop = &ecryptfs_dir_fops;
if (special_file(lower_inode->i_mode))
init_special_inode(inode, lower_inode->i_mode,
lower_inode->i_rdev);
fsstack_copy_attr_all(inode, lower_inode);
/* This size will be overwritten for real files w/ headers and
* other metadata */
fsstack_copy_inode_size(inode, lower_inode);
return inode;
out:
return ERR_PTR(rc);
}
/**
* ecryptfs_interpose
* @lower_dentry: Existing dentry in the lower filesystem
* @dentry: ecryptfs' dentry
* @sb: ecryptfs's super_block
* @flags: flags to govern behavior of interpose procedure
*
* Interposes upper and lower dentries.
*
* Returns zero on success; non-zero otherwise
*/
int ecryptfs_interpose(struct dentry *lower_dentry, struct dentry *dentry,
struct super_block *sb, u32 flags)
{
struct inode *lower_inode = lower_dentry->d_inode;
struct inode *inode = ecryptfs_get_inode(lower_inode, sb);
if (IS_ERR(inode))
return PTR_ERR(inode);
if (flags & ECRYPTFS_INTERPOSE_FLAG_D_ADD)
d_add(dentry, inode);
else
d_instantiate(dentry, inode);
return 0;
}
enum { ecryptfs_opt_sig, ecryptfs_opt_ecryptfs_sig, enum { ecryptfs_opt_sig, ecryptfs_opt_ecryptfs_sig,
ecryptfs_opt_cipher, ecryptfs_opt_ecryptfs_cipher, ecryptfs_opt_cipher, ecryptfs_opt_ecryptfs_cipher,
ecryptfs_opt_ecryptfs_key_bytes, ecryptfs_opt_ecryptfs_key_bytes,
...@@ -704,13 +635,8 @@ static struct ecryptfs_cache_info { ...@@ -704,13 +635,8 @@ static struct ecryptfs_cache_info {
.size = sizeof(struct ecryptfs_sb_info), .size = sizeof(struct ecryptfs_sb_info),
}, },
{ {
.cache = &ecryptfs_header_cache_1, .cache = &ecryptfs_header_cache,
.name = "ecryptfs_headers_1", .name = "ecryptfs_headers",
.size = PAGE_CACHE_SIZE,
},
{
.cache = &ecryptfs_header_cache_2,
.name = "ecryptfs_headers_2",
.size = PAGE_CACHE_SIZE, .size = PAGE_CACHE_SIZE,
}, },
{ {
......
fs/ecryptfs/super.c
View file @ bd1bfe40
...@@ -92,22 +92,6 @@ static void ecryptfs_destroy_inode(struct inode *inode) ...@@ -92,22 +92,6 @@ static void ecryptfs_destroy_inode(struct inode *inode)
call_rcu(&inode->i_rcu, ecryptfs_i_callback); call_rcu(&inode->i_rcu, ecryptfs_i_callback);
} }
/**
* ecryptfs_init_inode
* @inode: The ecryptfs inode
*
* Set up the ecryptfs inode.
*/
void ecryptfs_init_inode(struct inode *inode, struct inode *lower_inode)
{
ecryptfs_set_inode_lower(inode, lower_inode);
inode->i_ino = lower_inode->i_ino;
inode->i_version++;
inode->i_op = &ecryptfs_main_iops;
inode->i_fop = &ecryptfs_main_fops;
inode->i_mapping->a_ops = &ecryptfs_aops;
}
/** /**
* ecryptfs_statfs * ecryptfs_statfs
* @sb: The ecryptfs super block * @sb: The ecryptfs super block
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7