Kernel: Encapsulate assignment of socket origin/acceptor credentials

3 files changed, 16 insertions, 6 deletions

diff --git a/Kernel/Net/LocalSocket.cpp b/Kernel/Net/LocalSocket.cpp
index b783102a37..a8e1aef7fc 100644
--- a/Kernel/Net/LocalSocket.cpp
+++ b/Kernel/Net/LocalSocket.cpp
@@ -62,9 +62,7 @@ KResultOr<SocketPair> LocalSocket::create_connected_pair(int type)
     socket->m_address.sun_family = AF_LOCAL;
     memcpy(socket->m_address.sun_path, "[socketpair]", 13);
 
-    auto& process = Process::current();
-    socket->m_acceptor = { process.pid().value(), process.uid().value(), process.gid().value() };
-
+    socket->set_acceptor(Process::current());
     socket->set_connected(true);
     socket->set_connect_side_role(Role::Connected);
     socket->m_role = Role::Accepted;
diff --git a/Kernel/Net/Socket.cpp b/Kernel/Net/Socket.cpp
index 7ef57da95d..7dfa24ad34 100644
--- a/Kernel/Net/Socket.cpp
+++ b/Kernel/Net/Socket.cpp
@@ -38,8 +38,7 @@ Socket::Socket(int domain, int type, int protocol)
     , m_type(type)
     , m_protocol(protocol)
 {
-    auto& process = Process::current();
-    m_origin = { process.pid().value(), process.uid().value(), process.gid().value() };
+    set_origin(Process::current());
 }
 
 Socket::~Socket()
@@ -62,7 +61,7 @@ RefPtr<Socket> Socket::accept()
     auto client = m_pending.take_first();
     VERIFY(!client->is_connected());
     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_role = Role::Accepted;
     if (!m_pending.is_empty())
@@ -274,4 +273,14 @@ void Socket::set_connected(bool connected)
     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() };
+}
+
 }
diff --git a/Kernel/Net/Socket.h b/Kernel/Net/Socket.h
index e6f1472213..88c89500b7 100644
--- a/Kernel/Net/Socket.h
+++ b/Kernel/Net/Socket.h
@@ -137,6 +137,9 @@ protected:
         return error;
     }
 
+    void set_origin(Process const&);
+    void set_acceptor(Process const&);
+
 protected:
     ucred m_origin { 0, 0, 0 };
     ucred m_acceptor { 0, 0, 0 };