shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

ext4: fix use-after-iput when fscrypt contexts are inconsistent

Browse Source 
am: 68ca0fdac4

Change-Id: Ib125136b30c773718c8c2ec4e4a504da0ff92cbd
This commit is contained in:
Eric Biggers
2017-03-12 08:21:57 +00:00
committed by android-build-merger
parent 2cff3a2733 68ca0fdac4
commit 53a920dc64
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fs/ext4/namei.c
View File

@@ -1616,13 +1616,15 @@ static struct dentry *ext4_lookup(struct inode *dir, struct dentry *dentry, unsi
!fscrypt_has_permitted_context(dir, inode)) {
int nokey = ext4_encrypted_inode(inode) &&
!fscrypt_has_encryption_key(inode);
iput(inode);
if (nokey)
if (nokey) {
iput(inode);
return ERR_PTR(-ENOKEY);
}
ext4_warning(inode->i_sb,
"Inconsistent encryption contexts: %lu/%lu",
(unsigned long) dir->i_ino,
(unsigned long) inode->i_ino);
iput(inode);
return ERR_PTR(-EPERM);
}
}