system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-10-15 12:23:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Kernel+Base: Mount root filesystem read-only :^)

Browse source 
We remount /home and /root as read-write, to keep the ability to modify files
there. /tmp remains read-write, as it is mounted from a TmpFS.
This commit is contained in:
Sergey Bugaev 2020-05-28 18:06:13 +03:00 committed by Andreas Kling
parent 39cde80545
commit 53647e347f
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Base/etc/fstab
View file

@ -1,10 +1,12 @@
# Root file system. This is a fake entry which gets ignored by `mount -a`;
# the actual logic for mounting root is in the kernel.
/dev/hda / ext2 nodev,nosuid
# Remount /bin and /dev while adding the appropriate permissions.
/dev /dev bind bind,nosuid
/bin /bin bind bind,nodev
/dev/hda / ext2 nodev,nosuid,ro
# Remount /bin, /dev, /root, and /home while adding the appropriate permissions.
/dev /dev bind bind,nosuid,ro
/bin /bin bind bind,nodev,ro
/home /home bind bind,nodev,nosuid
/root /root bind bind,nodev,nosuid
none /proc proc nosuid
none /dev/pts devpts noexec,nosuid
none /dev/pts devpts noexec,nosuid,ro
none /tmp tmp nodev,nosuid

5
Kernel/FileSystem/VirtualFileSystem.cpp
View file

@ -42,6 +42,7 @@ namespace Kernel {
static VFS* s_the;
static constexpr int symlink_recursion_limit { 5 }; // FIXME: increase?
static constexpr int root_mount_flags = MS_NODEV | MS_NOSUID | MS_RDONLY;
VFS& VFS::the()
{
@ -116,7 +117,7 @@ bool VFS::mount_root(FS& file_system)
return false;
}
Mount mount { file_system, nullptr, MS_NODEV | MS_NOSUID };
Mount mount { file_system, nullptr, root_mount_flags };
auto root_inode_id = mount.guest().fs()->root_inode();
auto root_inode = mount.guest().fs()->get_inode(root_inode_id);
@ -734,7 +735,7 @@ void VFS::sync()
Custody& VFS::root_custody()
{
if (!m_root_custody)
m_root_custody = Custody::create(nullptr, "", *m_root_inode, MS_NODEV | MS_NOSUID);
m_root_custody = Custody::create(nullptr, "", *m_root_inode, root_mount_flags);
return *m_root_custody;
}