RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 15:07:45 +00:00
Code Issues Activity Actions

Kernel: Make File::{chown,chmod} take credentials as input

Browse source 
...instead of getting them from Process::current(). :^)
This commit is contained in:
Andreas Kling 2022-08-21 16:15:29 +02:00
parent c3351d4b9f
commit 006f753647
10 changed files with 26 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Kernel/FileSystem/File.h
View file

@ -98,8 +98,8 @@ public:
virtual ErrorOr<void> truncate(u64) { return EINVAL; }
virtual ErrorOr<void> sync() { return EINVAL; }
virtual ErrorOr<void> chown(OpenFileDescription&, UserID, GroupID) { return EBADF; }
virtual ErrorOr<void> chmod(OpenFileDescription&, mode_t) { return EBADF; }
virtual ErrorOr<void> chown(Credentials const&, OpenFileDescription&, UserID, GroupID) { return EBADF; }
virtual ErrorOr<void> chmod(Credentials const&, OpenFileDescription&, mode_t) { return EBADF; }
virtual StringView class_name() const = 0;

8
Kernel/FileSystem/InodeFile.cpp
View file

@ -115,18 +115,18 @@ ErrorOr<void> InodeFile::sync()
return {};
}
ErrorOr<void> InodeFile::chown(OpenFileDescription& description, UserID uid, GroupID gid)
ErrorOr<void> InodeFile::chown(Credentials const& credentials, OpenFileDescription& description, UserID uid, GroupID gid)
{
VERIFY(description.inode() == m_inode);
VERIFY(description.custody());
return VirtualFileSystem::the().chown(Process::current().credentials(), *description.custody(), uid, gid);
return VirtualFileSystem::the().chown(credentials, *description.custody(), uid, gid);
}
ErrorOr<void> InodeFile::chmod(OpenFileDescription& description, mode_t mode)
ErrorOr<void> InodeFile::chmod(Credentials const& credentials, OpenFileDescription& description, mode_t mode)
{
VERIFY(description.inode() == m_inode);
VERIFY(description.custody());
return VirtualFileSystem::the().chmod(Process::current().credentials(), *description.custody(), mode);
return VirtualFileSystem::the().chmod(credentials, *description.custody(), mode);
}
}

4
Kernel/FileSystem/InodeFile.h
View file

@ -40,8 +40,8 @@ public:
virtual ErrorOr<void> truncate(u64) override;
virtual ErrorOr<void> sync() override;
virtual ErrorOr<void> chown(OpenFileDescription&, UserID, GroupID) override;
virtual ErrorOr<void> chmod(OpenFileDescription&, mode_t) override;
virtual ErrorOr<void> chown(Credentials const&, OpenFileDescription&, UserID, GroupID) override;
virtual ErrorOr<void> chmod(Credentials const&, OpenFileDescription&, mode_t) override;
virtual StringView class_name() const override { return "InodeFile"sv; }

8
Kernel/FileSystem/OpenFileDescription.cpp
View file

@ -430,14 +430,14 @@ void OpenFileDescription::set_file_flags(u32 flags)
});
}
ErrorOr<void> OpenFileDescription::chmod(mode_t mode)
ErrorOr<void> OpenFileDescription::chmod(Credentials const& credentials, mode_t mode)
{
return m_file->chmod(*this, mode);
return m_file->chmod(credentials, *this, mode);
}
ErrorOr<void> OpenFileDescription::chown(UserID uid, GroupID gid)
ErrorOr<void> OpenFileDescription::chown(Credentials const& credentials, UserID uid, GroupID gid)
{
return m_file->chown(*this, uid, gid);
return m_file->chown(credentials, *this, uid, gid);
}
FileBlockerSet& OpenFileDescription::blocker_set()

4
Kernel/FileSystem/OpenFileDescription.h
View file

@ -50,7 +50,7 @@ public:
ErrorOr<size_t> read(UserOrKernelBuffer&, u64 offset, size_t);
ErrorOr<size_t> write(u64 offset, UserOrKernelBuffer const&, size_t);
ErrorOr<void> chmod(mode_t);
ErrorOr<void> chmod(Credentials const& credentials, mode_t);
bool can_read() const;
bool can_write() const;
@ -121,7 +121,7 @@ public:
off_t offset() const;
ErrorOr<void> chown(UserID, GroupID);
ErrorOr<void> chown(Credentials const& credentials, UserID, GroupID);
FileBlockerSet& blocker_set();