FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-23 18:07:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vfs: don't evict uninitialized inode

Browse Source 
iput() ends up calling ->evict() on new inode, which is not yet initialized
by owning fs.  So use destroy_inode() instead.

Add to sb->s_inodes list only if inode is not in I_CREATING state (meaning
that it wasn't allocated with new_inode(), which already does the
insertion).

Reported-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Fixes: 80ea09a002 ("vfs: factor out inode_insert5()")
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Miklos Szeredi 2018-07-24 15:01:55 +02:00 committed by Al Viro
parent a6cbedfa87
commit e950564b97
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/inode.c
View File

@ -1050,6 +1050,7 @@ struct inode *inode_insert5(struct inode *inode, unsigned long hashval,
{ {
struct hlist_head *head = inode_hashtable + hash(inode->i_sb, hashval); struct hlist_head *head = inode_hashtable + hash(inode->i_sb, hashval);
struct inode *old; struct inode *old;
bool creating = inode->i_state & I_CREATING;
again: again:
spin_lock(&inode_hash_lock); spin_lock(&inode_hash_lock);
@ -1083,6 +1084,8 @@ again:
inode->i_state |= I_NEW; inode->i_state |= I_NEW;
hlist_add_head(&inode->i_hash, head); hlist_add_head(&inode->i_hash, head);
spin_unlock(&inode->i_lock); spin_unlock(&inode->i_lock);
if (!creating)
inode_sb_list_add(inode);
unlock: unlock:
spin_unlock(&inode_hash_lock); spin_unlock(&inode_hash_lock);
@ -1117,12 +1120,13 @@ struct inode *iget5_locked(struct super_block *sb, unsigned long hashval,
struct inode *inode = ilookup5(sb, hashval, test, data); struct inode *inode = ilookup5(sb, hashval, test, data);
if (!inode) { if (!inode) {
struct inode *new = new_inode(sb); struct inode *new = alloc_inode(sb);
if (new) { if (new) {
new->i_state = 0;
inode = inode_insert5(new, hashval, test, set, data); inode = inode_insert5(new, hashval, test, set, data);
if (unlikely(inode != new)) if (unlikely(inode != new))
iput(new); destroy_inode(new);
} }
} }
return inode; return inode;