lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge tag 'ecryptfs-4.3-rc1-stale-dcache' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs

Browse Source 
Pull ecryptfs fixes from Tyler Hicks:
 "Invalidate stale eCryptfs dcache entries caused by unlinked lower
  inodes"

* tag 'ecryptfs-4.3-rc1-stale-dcache' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
  eCryptfs: Delete a check before the function call "key_put"
  eCryptfs: Invalidate dcache entries when lower i_nlink is zero
This commit is contained in:
Linus Torvalds
2015-09-08 11:26:17 -07:00
parent 0c8e2f2c7b 0dad87fcb7
commit b9ffce9ae1
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fs/ecryptfs/crypto.c
View File

@@ -258,8 +258,7 @@ void ecryptfs_destroy_mount_crypt_stat(
&mount_crypt_stat->global_auth_tok_list, &mount_crypt_stat->global_auth_tok_list,
mount_crypt_stat_list) { mount_crypt_stat_list) {
list_del(&auth_tok->mount_crypt_stat_list); list_del(&auth_tok->mount_crypt_stat_list);
if (auth_tok->global_auth_tok_key if (!(auth_tok->flags & ECRYPTFS_AUTH_TOK_INVALID))
&& !(auth_tok->flags & ECRYPTFS_AUTH_TOK_INVALID))
key_put(auth_tok->global_auth_tok_key); key_put(auth_tok->global_auth_tok_key);
kmem_cache_free(ecryptfs_global_auth_tok_cache, auth_tok); kmem_cache_free(ecryptfs_global_auth_tok_cache, auth_tok);
} }

18
fs/ecryptfs/dentry.c
View File

@@ -45,20 +45,20 @@
static int ecryptfs_d_revalidate(struct dentry *dentry, unsigned int flags) static int ecryptfs_d_revalidate(struct dentry *dentry, unsigned int flags)
{ {
struct dentry *lower_dentry = ecryptfs_dentry_to_lower(dentry); struct dentry *lower_dentry = ecryptfs_dentry_to_lower(dentry);
int rc; int rc = 1;
if (!(lower_dentry->d_flags & DCACHE_OP_REVALIDATE))
return 1;
if (flags & LOOKUP_RCU) if (flags & LOOKUP_RCU)
return -ECHILD; return -ECHILD;
rc = lower_dentry->d_op->d_revalidate(lower_dentry, flags); if (lower_dentry->d_flags & DCACHE_OP_REVALIDATE)
if (d_really_is_positive(dentry)) { rc = lower_dentry->d_op->d_revalidate(lower_dentry, flags);
struct inode *lower_inode =
ecryptfs_inode_to_lower(d_inode(dentry));
fsstack_copy_attr_all(d_inode(dentry), lower_inode); if (d_really_is_positive(dentry)) {
struct inode *inode = d_inode(dentry);
fsstack_copy_attr_all(inode, ecryptfs_inode_to_lower(inode));
if (!inode->i_nlink)
return 0;
} }
return rc; return rc;
} }