| Message ID | 1459026600-9232-6-git-send-email-tytso@mit.edu |
|---|---|
| State | Awaiting Upstream, archived |
| Headers | show |
On Sat, Mar 26, 2016 at 10:10 PM, Theodore Ts'o <tytso@mit.edu> wrote: > This avoids potential problems caused by a race where the inode gets > renamed out from its parent directory and the parent directory is > deleted while ext4_d_revalidate() is running. > > Fixes: 28b4c263961c Full Fixes-tag... Fixes: 28b4c263961c ("ext4 crypto: revalidate dentry after adding or removing the key") > Reported-by: Al Viro <viro@ZenIV.linux.org.uk> > Signed-off-by: Theodore Ts'o <tytso@mit.edu> > Cc: stable@vger.kernel.org This for Linux v4.6(-rc1+) ? - Sedat - > --- > fs/ext4/crypto.c | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/fs/ext4/crypto.c b/fs/ext4/crypto.c > index 012fd32..ea69ce4 100644 > --- a/fs/ext4/crypto.c > +++ b/fs/ext4/crypto.c > @@ -478,13 +478,16 @@ uint32_t ext4_validate_encryption_key_size(uint32_t mode, uint32_t size) > */ > static int ext4_d_revalidate(struct dentry *dentry, unsigned int flags) > { > - struct inode *dir = d_inode(dentry->d_parent); > - struct ext4_crypt_info *ci = EXT4_I(dir)->i_crypt_info; > + struct dentry *dir; > + struct ext4_crypt_info *ci; > int dir_has_key, cached_with_key; > > - if (!ext4_encrypted_inode(dir)) > + dir = dget_parent(dentry); > + if (!ext4_encrypted_inode(d_inode(dir))) { > + dput(dir); > return 0; > - > + } > + ci = EXT4_I(d_inode(dir))->i_crypt_info; > if (ci && ci->ci_keyring_key && > (ci->ci_keyring_key->flags & ((1 << KEY_FLAG_INVALIDATED) | > (1 << KEY_FLAG_REVOKED) | > @@ -494,6 +497,7 @@ static int ext4_d_revalidate(struct dentry *dentry, unsigned int flags) > /* this should eventually be an flag in d_flags */ > cached_with_key = dentry->d_fsdata != NULL; > dir_has_key = (ci != NULL); > + dput(dir); > > /* > * If the dentry was cached without the key, and it is a > -- > 2.5.0 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sun, Mar 27, 2016 at 10:02:46AM +0200, Sedat Dilek wrote: > On Sat, Mar 26, 2016 at 10:10 PM, Theodore Ts'o <tytso@mit.edu> wrote: > > This avoids potential problems caused by a race where the inode gets > > renamed out from its parent directory and the parent directory is > > deleted while ext4_d_revalidate() is running. > > > > Fixes: 28b4c263961c > > Full Fixes-tag... > > Fixes: 28b4c263961c ("ext4 crypto: revalidate dentry after adding or > removing the key") > > > Reported-by: Al Viro <viro@ZenIV.linux.org.uk> > > Signed-off-by: Theodore Ts'o <tytso@mit.edu> > > Cc: stable@vger.kernel.org > > This for Linux v4.6(-rc1+) ? Probably v4.6-rc2 at this point, since I'm still waiting for acks from folks. - Ted -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/ext4/crypto.c b/fs/ext4/crypto.c index 012fd32..ea69ce4 100644 --- a/fs/ext4/crypto.c +++ b/fs/ext4/crypto.c @@ -478,13 +478,16 @@ uint32_t ext4_validate_encryption_key_size(uint32_t mode, uint32_t size) */ static int ext4_d_revalidate(struct dentry *dentry, unsigned int flags) { - struct inode *dir = d_inode(dentry->d_parent); - struct ext4_crypt_info *ci = EXT4_I(dir)->i_crypt_info; + struct dentry *dir; + struct ext4_crypt_info *ci; int dir_has_key, cached_with_key; - if (!ext4_encrypted_inode(dir)) + dir = dget_parent(dentry); + if (!ext4_encrypted_inode(d_inode(dir))) { + dput(dir); return 0; - + } + ci = EXT4_I(d_inode(dir))->i_crypt_info; if (ci && ci->ci_keyring_key && (ci->ci_keyring_key->flags & ((1 << KEY_FLAG_INVALIDATED) | (1 << KEY_FLAG_REVOKED) | @@ -494,6 +497,7 @@ static int ext4_d_revalidate(struct dentry *dentry, unsigned int flags) /* this should eventually be an flag in d_flags */ cached_with_key = dentry->d_fsdata != NULL; dir_has_key = (ci != NULL); + dput(dir); /* * If the dentry was cached without the key, and it is a
This avoids potential problems caused by a race where the inode gets renamed out from its parent directory and the parent directory is deleted while ext4_d_revalidate() is running. Fixes: 28b4c263961c Reported-by: Al Viro <viro@ZenIV.linux.org.uk> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Cc: stable@vger.kernel.org --- fs/ext4/crypto.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)