RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-24 16:37:35 +00:00
Code Issues Activity Actions

Kernel: Encapsulate assignment of socket origin/acceptor credentials

Browse source
This commit is contained in:
Andreas Kling 2021-08-29 01:30:05 +02:00
parent 242063866f
commit 7f96288535
3 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Kernel/Net/LocalSocket.cpp
View file

@ -62,9 +62,7 @@ KResultOr<SocketPair> LocalSocket::create_connected_pair(int type)
socket->m_address.sun_family = AF_LOCAL; socket->m_address.sun_family = AF_LOCAL;
memcpy(socket->m_address.sun_path, "[socketpair]", 13); memcpy(socket->m_address.sun_path, "[socketpair]", 13);
auto& process = Process::current(); socket->set_acceptor(Process::current());
socket->m_acceptor = { process.pid().value(), process.uid().value(), process.gid().value() };
socket->set_connected(true); socket->set_connected(true);
socket->set_connect_side_role(Role::Connected); socket->set_connect_side_role(Role::Connected);
socket->m_role = Role::Accepted; socket->m_role = Role::Accepted;

15
Kernel/Net/Socket.cpp
View file

@ -38,8 +38,7 @@ Socket::Socket(int domain, int type, int protocol)
, m_type(type) , m_type(type)
, m_protocol(protocol) , m_protocol(protocol)
{ {
auto& process = Process::current(); set_origin(Process::current());
m_origin = { process.pid().value(), process.uid().value(), process.gid().value() };
} }
Socket::~Socket() Socket::~Socket()
@ -62,7 +61,7 @@ RefPtr<Socket> Socket::accept()
auto client = m_pending.take_first(); auto client = m_pending.take_first();
VERIFY(!client->is_connected()); VERIFY(!client->is_connected());
auto& process = Process::current(); auto& process = Process::current();
client->m_acceptor = { process.pid().value(), process.uid().value(), process.gid().value() }; client->set_acceptor(process);
client->m_connected = true; client->m_connected = true;
client->m_role = Role::Accepted; client->m_role = Role::Accepted;
if (!m_pending.is_empty()) if (!m_pending.is_empty())
@ -274,4 +273,14 @@ void Socket::set_connected(bool connected)
evaluate_block_conditions(); evaluate_block_conditions();
} }
void Socket::set_origin(Process const& process)
{
m_origin = { process.pid().value(), process.uid().value(), process.gid().value() };
}
void Socket::set_acceptor(Process const& process)
{
m_acceptor = { process.pid().value(), process.uid().value(), process.gid().value() };
}
} }

3
Kernel/Net/Socket.h
View file

@ -137,6 +137,9 @@ protected:
return error; return error;
} }
void set_origin(Process const&);
void set_acceptor(Process const&);
protected: protected:
ucred m_origin { 0, 0, 0 }; ucred m_origin { 0, 0, 0 };
ucred m_acceptor { 0, 0, 0 }; ucred m_acceptor { 0, 0, 0 };