RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 12:17:35 +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

11
Kernel/Net/LocalSocket.cpp
View file

@ -445,8 +445,10 @@ ErrorOr<void> LocalSocket::ioctl(OpenFileDescription& description, unsigned requ
return EINVAL;
}
ErrorOr<void> LocalSocket::chmod(OpenFileDescription&, mode_t mode)
ErrorOr<void> LocalSocket::chmod(Credentials const&, OpenFileDescription&, mode_t mode)
{
// FIXME: Use the credentials.
auto inode = m_inode.strong_ref();
if (inode)
return inode->chmod(mode);
@ -455,14 +457,15 @@ ErrorOr<void> LocalSocket::chmod(OpenFileDescription&, mode_t mode)
return {};
}
ErrorOr<void> LocalSocket::chown(OpenFileDescription&, UserID uid, GroupID gid)
ErrorOr<void> LocalSocket::chown(Credentials const& credentials, OpenFileDescription&, UserID uid, GroupID gid)
{
// FIXME: Use the credentials.
auto inode = m_inode.strong_ref();
if (inode)
return inode->chown(uid, gid);
auto& current_process = Process::current();
if (!current_process.is_superuser() && (current_process.euid() != uid || !current_process.in_group(gid)))
if (!credentials.is_superuser() && (credentials.euid() != uid || !credentials.in_group(gid)))
return set_so_error(EPERM);
m_prebind_uid = uid;

4
Kernel/Net/LocalSocket.h
View file

@ -49,8 +49,8 @@ public:
virtual ErrorOr<size_t> recvfrom(OpenFileDescription&, UserOrKernelBuffer&, size_t, int flags, Userspace<sockaddr*>, Userspace<socklen_t*>, Time&) override;
virtual ErrorOr<void> getsockopt(OpenFileDescription&, int level, int option, Userspace<void*>, Userspace<socklen_t*>) override;
virtual ErrorOr<void> ioctl(OpenFileDescription&, unsigned request, Userspace<void*> arg) 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;
private:
explicit LocalSocket(int type, NonnullOwnPtr<DoubleBuffer> client_buffer, NonnullOwnPtr<DoubleBuffer> server_buffer);