LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-01-05 01:55:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

Kernel: Harden Socket::pseudo_path(..) implementations against OOM

Browse Source 
Use the try variants of AK::StringBuilder append APIs to harden these
functions against OOM.
This commit is contained in:
Brian Gianforcaro 2022-01-09 00:59:12 -08:00 committed by Andreas Kling
parent ea66750640
commit ccbc3f8975
Notes: sideshowbarker 2024-07-17 21:20:58 +09:00 
Author: https://github.com/bgianfo
Commit: https://github.com/SerenityOS/serenity/commit/ccbc3f89753
Pull-request: https://github.com/SerenityOS/serenity/pull/11758
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Kernel/Net/IPv4Socket.cpp
View File

@ -474,24 +474,24 @@ ErrorOr<NonnullOwnPtr<KString>> IPv4Socket::pseudo_path(const OpenFileDescriptio
return KString::try_create("socket"sv);
StringBuilder builder;
builder.append("socket:");
TRY(builder.try_append("socket:"));
builder.appendff("{}:{}", m_local_address.to_string(), m_local_port);
TRY(builder.try_appendff("{}:{}", m_local_address.to_string(), m_local_port));
if (m_role == Role::Accepted || m_role == Role::Connected)
builder.appendff(" / {}:{}", m_peer_address.to_string(), m_peer_port);
TRY(builder.try_appendff(" / {}:{}", m_peer_address.to_string(), m_peer_port));
switch (m_role) {
case Role::Listener:
builder.append(" (listening)");
TRY(builder.try_append(" (listening)"));
break;
case Role::Accepted:
builder.append(" (accepted)");
TRY(builder.try_append(" (accepted)"));
break;
case Role::Connected:
builder.append(" (connected)");
TRY(builder.try_append(" (connected)"));
break;
case Role::Connecting:
builder.append(" (connecting)");
TRY(builder.try_append(" (connecting)"));
break;
default:
VERIFY_NOT_REACHED();

12
Kernel/Net/LocalSocket.cpp
View File

@ -358,21 +358,21 @@ StringView LocalSocket::socket_path() const
ErrorOr<NonnullOwnPtr<KString>> LocalSocket::pseudo_path(const OpenFileDescription& description) const
{
StringBuilder builder;
builder.append("socket:");
builder.append(socket_path());
TRY(builder.try_append("socket:"));
TRY(builder.try_append(socket_path()));
switch (role(description)) {
case Role::Listener:
builder.append(" (listening)");
TRY(builder.try_append(" (listening)"));
break;
case Role::Accepted:
builder.appendff(" (accepted from pid {})", origin_pid());
TRY(builder.try_appendff(" (accepted from pid {})", origin_pid()));
break;
case Role::Connected:
builder.appendff(" (connected to pid {})", acceptor_pid());
TRY(builder.try_appendff(" (connected to pid {})", acceptor_pid()));
break;
case Role::Connecting:
builder.append(" (connecting)");
TRY(builder.try_append(" (connecting)"));
break;
default:
break;