mirror of
git://git.yoctoproject.org/linux-yocto.git
synced 2025-07-05 13:25:20 +02:00
fs/9p: fix uninitialized values during inode evict
[ Upstream commit 6630036b7c
]
If an iget fails due to not being able to retrieve information
from the server then the inode structure is only partially
initialized. When the inode gets evicted, references to
uninitialized structures (like fscache cookies) were being
made.
This patch checks for a bad_inode before doing anything other
than clearing the inode from the cache. Since the inode is
bad, it shouldn't have any state associated with it that needs
to be written back (and there really isn't a way to complete
those anyways).
Reported-by: syzbot+eb83fe1cce5833cd66a0@syzkaller.appspotmail.com
Signed-off-by: Eric Van Hensbergen <ericvh@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
[Xiangyu: CVE-2024-36923 Minor conflict resolution ]
Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
f111de0f01
commit
3a741b80b3
|
@ -374,6 +374,7 @@ void v9fs_evict_inode(struct inode *inode)
|
|||
struct v9fs_inode __maybe_unused *v9inode = V9FS_I(inode);
|
||||
__le32 __maybe_unused version;
|
||||
|
||||
if (!is_bad_inode(inode)) {
|
||||
truncate_inode_pages_final(&inode->i_data);
|
||||
|
||||
#ifdef CONFIG_9P_FSCACHE
|
||||
|
@ -381,13 +382,15 @@ void v9fs_evict_inode(struct inode *inode)
|
|||
fscache_clear_inode_writeback(v9fs_inode_cookie(v9inode), inode,
|
||||
&version);
|
||||
#endif
|
||||
|
||||
clear_inode(inode);
|
||||
filemap_fdatawrite(&inode->i_data);
|
||||
|
||||
#ifdef CONFIG_9P_FSCACHE
|
||||
if (v9fs_inode_cookie(v9inode))
|
||||
fscache_relinquish_cookie(v9fs_inode_cookie(v9inode), false);
|
||||
#endif
|
||||
} else
|
||||
clear_inode(inode);
|
||||
}
|
||||
|
||||
static int v9fs_test_inode(struct inode *inode, void *data)
|
||||
|
|
Loading…
Reference in New Issue
Block a user