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

Kernel: Handle OOM when allocating IPv4Socket optional scratch buffer

Browse source
This commit is contained in:
Brian Gianforcaro 2021-08-01 05:11:05 -07:00 • committed by Andreas Kling
parent a6db2f985a
commit c1a0e379e6
5 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Kernel/Net/IPv4Socket.cpp
View file

@ -59,7 +59,7 @@ KResultOr<NonnullRefPtr<Socket>> IPv4Socket::create(int type, int protocol)
return udp_socket.release_value(); return udp_socket.release_value();
} }
if (type == SOCK_RAW) { if (type == SOCK_RAW) {
auto raw_socket = adopt_ref_if_nonnull(new (nothrow) IPv4Socket(type, protocol, receive_buffer.release_nonnull())); auto raw_socket = adopt_ref_if_nonnull(new (nothrow) IPv4Socket(type, protocol, receive_buffer.release_nonnull(), {}));
if (raw_socket) if (raw_socket)
return raw_socket.release_nonnull(); return raw_socket.release_nonnull();
return ENOMEM; return ENOMEM;
@ -67,14 +67,15 @@ KResultOr<NonnullRefPtr<Socket>> IPv4Socket::create(int type, int protocol)
return EINVAL; return EINVAL;
} }
IPv4Socket::IPv4Socket(int type, int protocol, NonnullOwnPtr<DoubleBuffer> receive_buffer) IPv4Socket::IPv4Socket(int type, int protocol, NonnullOwnPtr<DoubleBuffer> receive_buffer, OwnPtr<KBuffer> optional_scratch_buffer)
: Socket(AF_INET, type, protocol) : Socket(AF_INET, type, protocol)
, m_receive_buffer(move(receive_buffer)) , m_receive_buffer(move(receive_buffer))
, m_scratch_buffer(move(optional_scratch_buffer))
{ {
dbgln_if(IPV4_SOCKET_DEBUG, "IPv4Socket({}) created with type={}, protocol={}", this, type, protocol); dbgln_if(IPV4_SOCKET_DEBUG, "IPv4Socket({}) created with type={}, protocol={}", this, type, protocol);
m_buffer_mode = type == SOCK_STREAM ? BufferMode::Bytes : BufferMode::Packets; m_buffer_mode = type == SOCK_STREAM ? BufferMode::Bytes : BufferMode::Packets;
if (m_buffer_mode == BufferMode::Bytes) { if (m_buffer_mode == BufferMode::Bytes) {
m_scratch_buffer = KBuffer::create_with_size(65536); VERIFY(m_scratch_buffer);
} }
MutexLocker locker(all_sockets().lock()); MutexLocker locker(all_sockets().lock());
all_sockets().resource().set(this); all_sockets().resource().set(this);
@ -422,8 +423,8 @@ bool IPv4Socket::did_receive(const IPv4Address& source_address, u16 source_port,
VERIFY(m_can_read); VERIFY(m_can_read);
return false; return false;
} }
auto scratch_buffer = UserOrKernelBuffer::for_kernel_buffer(m_scratch_buffer.value().data()); auto scratch_buffer = UserOrKernelBuffer::for_kernel_buffer(m_scratch_buffer->data());
auto nreceived_or_error = protocol_receive(ReadonlyBytes { packet.data(), packet.size() }, scratch_buffer, m_scratch_buffer.value().size(), 0); auto nreceived_or_error = protocol_receive(packet, scratch_buffer, m_scratch_buffer->size(), 0);
if (nreceived_or_error.is_error()) if (nreceived_or_error.is_error())
return false; return false;
auto nwritten_or_error = m_receive_buffer->write(scratch_buffer, nreceived_or_error.value()); auto nwritten_or_error = m_receive_buffer->write(scratch_buffer, nreceived_or_error.value());

4
Kernel/Net/IPv4Socket.h
View file

@ -74,7 +74,7 @@ public:
BufferMode buffer_mode() const { return m_buffer_mode; } BufferMode buffer_mode() const { return m_buffer_mode; }
protected: protected:
IPv4Socket(int type, int protocol, NonnullOwnPtr<DoubleBuffer> receive_buffer); IPv4Socket(int type, int protocol, NonnullOwnPtr<DoubleBuffer> receive_buffer, OwnPtr<KBuffer> optional_scratch_buffer);
virtual StringView class_name() const override { return "IPv4Socket"; } virtual StringView class_name() const override { return "IPv4Socket"; }
PortAllocationResult allocate_local_port_if_needed(); PortAllocationResult allocate_local_port_if_needed();
@ -130,7 +130,7 @@ private:
BufferMode m_buffer_mode { BufferMode::Packets }; BufferMode m_buffer_mode { BufferMode::Packets };
Optional<KBuffer> m_scratch_buffer; OwnPtr<KBuffer> m_scratch_buffer;
}; };
} }

11
Kernel/Net/TCPSocket.cpp
View file

@ -134,8 +134,8 @@ void TCPSocket::release_for_accept(RefPtr<TCPSocket> socket)
[[maybe_unused]] auto rc = queue_connection_from(*socket); [[maybe_unused]] auto rc = queue_connection_from(*socket);
} }
TCPSocket::TCPSocket(int protocol, NonnullOwnPtr<DoubleBuffer> receive_buffer) TCPSocket::TCPSocket(int protocol, NonnullOwnPtr<DoubleBuffer> receive_buffer, OwnPtr<KBuffer> scratch_buffer)
: IPv4Socket(SOCK_STREAM, protocol, move(receive_buffer)) : IPv4Socket(SOCK_STREAM, protocol, move(receive_buffer), move(scratch_buffer))
{ {
m_last_retransmit_time = kgettimeofday(); m_last_retransmit_time = kgettimeofday();
} }
@ -152,7 +152,12 @@ TCPSocket::~TCPSocket()
KResultOr<NonnullRefPtr<TCPSocket>> TCPSocket::create(int protocol, NonnullOwnPtr<DoubleBuffer> receive_buffer) KResultOr<NonnullRefPtr<TCPSocket>> TCPSocket::create(int protocol, NonnullOwnPtr<DoubleBuffer> receive_buffer)
{ {
auto socket = adopt_ref_if_nonnull(new (nothrow) TCPSocket(protocol, move(receive_buffer))); // Note: Scratch buffer is only used for SOCK_STREAM sockets.
auto scratch_buffer = KBuffer::try_create_with_size(65536);
if (!scratch_buffer)
return ENOMEM;
auto socket = adopt_ref_if_nonnull(new (nothrow) TCPSocket(protocol, move(receive_buffer), move(scratch_buffer)));
if (socket) if (socket)
return socket.release_nonnull(); return socket.release_nonnull();
return ENOMEM; return ENOMEM;

2
Kernel/Net/TCPSocket.h
View file

@ -165,7 +165,7 @@ protected:
void set_direction(Direction direction) { m_direction = direction; } void set_direction(Direction direction) { m_direction = direction; }
private: private:
explicit TCPSocket(int protocol, NonnullOwnPtr<DoubleBuffer> receive_buffer); explicit TCPSocket(int protocol, NonnullOwnPtr<DoubleBuffer> receive_buffer, OwnPtr<KBuffer> scratch_buffer);
virtual StringView class_name() const override { return "TCPSocket"; } virtual StringView class_name() const override { return "TCPSocket"; }
virtual void shut_down_for_writing() override; virtual void shut_down_for_writing() override;

2
Kernel/Net/UDPSocket.cpp
View file

@ -44,7 +44,7 @@ SocketHandle<UDPSocket> UDPSocket::from_port(u16 port)
} }
UDPSocket::UDPSocket(int protocol, NonnullOwnPtr<DoubleBuffer> receive_buffer) UDPSocket::UDPSocket(int protocol, NonnullOwnPtr<DoubleBuffer> receive_buffer)
: IPv4Socket(SOCK_DGRAM, protocol, move(receive_buffer)) : IPv4Socket(SOCK_DGRAM, protocol, move(receive_buffer), {})
{ {
} }