RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-28 17:25:06 +00:00
Code Issues Activity Actions

Kernel/VFS: Check that mount-point is not in use

Browse source 
Before committing the mount, verify that this host i-node is not already
a mount-point.
This commit is contained in:
Kristiyan Stoimenov 2022-08-10 18:50:23 +03:00 • committed by Brian Gianforcaro
parent 7e245b74f1
commit 9e1bea50ee
2 changed files with 23 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Kernel/FileSystem/VirtualFileSystem.cpp
View file

@ -4,6 +4,7 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <AK/AnyOf.h>
#include <AK/GenericLexer.h> #include <AK/GenericLexer.h>
#include <AK/Singleton.h> #include <AK/Singleton.h>
#include <AK/StringBuilder.h> #include <AK/StringBuilder.h>
@ -48,6 +49,15 @@ InodeIdentifier VirtualFileSystem::root_inode_id() const
return m_root_inode->identifier(); return m_root_inode->identifier();
} }
bool VirtualFileSystem::mount_point_exists_at_inode(InodeIdentifier inode_identifier)
{
return m_mounts.with([&](auto& mounts) -> bool {
return any_of(mounts, [&inode_identifier](Mount const& existing_mount) {
return existing_mount.host() && existing_mount.host()->identifier() == inode_identifier;
});
});
}
ErrorOr<void> VirtualFileSystem::mount(FileSystem& fs, Custody& mount_point, int flags) ErrorOr<void> VirtualFileSystem::mount(FileSystem& fs, Custody& mount_point, int flags)
{ {
return m_mounts.with([&](auto& mounts) -> ErrorOr<void> { return m_mounts.with([&](auto& mounts) -> ErrorOr<void> {
@ -56,7 +66,10 @@ ErrorOr<void> VirtualFileSystem::mount(FileSystem& fs, Custody& mount_point, int
fs.class_name(), fs.class_name(),
inode.identifier(), inode.identifier(),
flags); flags);
// FIXME: check that this is not already a mount point if (mount_point_exists_at_inode(inode.identifier())) {
dbgln("VirtualFileSystem: Mounting unsuccessful - inode {} is already a mount-point.", inode.identifier());
return EBUSY;
}
Mount mount { fs, &mount_point, flags }; Mount mount { fs, &mount_point, flags };
mounts.append(move(mount)); mounts.append(move(mount));
return {}; return {};
@ -66,8 +79,13 @@ ErrorOr<void> VirtualFileSystem::mount(FileSystem& fs, Custody& mount_point, int
ErrorOr<void> VirtualFileSystem::bind_mount(Custody& source, Custody& mount_point, int flags) ErrorOr<void> VirtualFileSystem::bind_mount(Custody& source, Custody& mount_point, int flags)
{ {
return m_mounts.with([&](auto& mounts) -> ErrorOr<void> { return m_mounts.with([&](auto& mounts) -> ErrorOr<void> {
dbgln("VirtualFileSystem: Bind-mounting inode {} at inode {}", source.inode().identifier(), mount_point.inode().identifier()); auto& inode = mount_point.inode();
// FIXME: check that this is not already a mount point dbgln("VirtualFileSystem: Bind-mounting inode {} at inode {}", source.inode().identifier(), inode.identifier());
if (mount_point_exists_at_inode(inode.identifier())) {
dbgln("VirtualFileSystem: Bind-mounting unsuccessful - inode {} is already a mount-point.",
mount_point.inode().identifier());
return EBUSY;
}
Mount mount { source.inode(), mount_point, flags }; Mount mount { source.inode(), mount_point, flags };
mounts.append(move(mount)); mounts.append(move(mount));
return {}; return {};

2
Kernel/FileSystem/VirtualFileSystem.h
View file

@ -90,6 +90,8 @@ private:
ErrorOr<void> traverse_directory_inode(Inode&, Function<ErrorOr<void>(FileSystem::DirectoryEntryView const&)>); ErrorOr<void> traverse_directory_inode(Inode&, Function<ErrorOr<void>(FileSystem::DirectoryEntryView const&)>);
bool mount_point_exists_at_inode(InodeIdentifier inode);
Mount* find_mount_for_host(InodeIdentifier); Mount* find_mount_for_host(InodeIdentifier);
Mount* find_mount_for_guest(InodeIdentifier); Mount* find_mount_for_guest(InodeIdentifier);