system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-10-18 13:53:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix deadlock in synthfs read implementation.

Browse source 
Not cool disabling interrupts and then calling out to arbitrary code.
This commit is contained in:
Andreas Kling 2018-11-08 16:07:45 +01:00
parent 3b2dcd5929
commit abdf24cb73
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
VirtualFileSystem/SyntheticFileSystem.cpp
View file

@ -194,8 +194,6 @@ bool SyntheticFileSystem::writeInode(InodeIdentifier, const ByteBuffer&)
Unix::ssize_t SyntheticFileSystem::readInodeBytes(InodeIdentifier inode, Unix::off_t offset, Unix::size_t count, byte* buffer, FileDescriptor* handle) const
{
InterruptDisabler disabler;
ASSERT(inode.fileSystemID() == id());
#ifdef SYNTHFS_DEBUG
kprintf("synthfs: readInode %u\n", inode.index());
@ -203,10 +201,15 @@ Unix::ssize_t SyntheticFileSystem::readInodeBytes(InodeIdentifier inode, Unix::o
ASSERT(offset >= 0);
ASSERT(buffer);
auto it = m_inodes.find(inode.index());
if (it == m_inodes.end())
return false;
const File& file = *(*it).value;
const File* found_file;
{
InterruptDisabler disabler;
auto it = m_inodes.find(inode.index());
if (it == m_inodes.end())
return false;
found_file = (*it).value.ptr();
}
const File& file = *found_file;
ByteBuffer generatedData;
if (file.generator) {
if (!handle) {