RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-16 19:55:06 +00:00
Code Issues Activity Actions

Kernel: connect() should fail with EISCONN for already-connected sockets.

Browse source 
Also make sure to reset the socket role if Socket::connect() fails.
This commit is contained in:
Andreas Kling 2019-03-20 02:38:36 +01:00
parent 4aa0ab4e08
commit e48cbf3c8c
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Kernel/FileDescriptor.h
View file

@ -88,6 +88,7 @@ public:
void set_original_inode(Badge<VFS>, Retained<Inode>&& inode) { m_inode = move(inode); } void set_original_inode(Badge<VFS>, Retained<Inode>&& inode) { m_inode = move(inode); }
SocketRole socket_role() const { return m_socket_role; }
void set_socket_role(SocketRole); void set_socket_role(SocketRole);
private: private:

6
Kernel/Process.cpp
View file

@ -2502,11 +2502,15 @@ int Process::sys$connect(int sockfd, const sockaddr* address, socklen_t address_
return -EBADF; return -EBADF;
if (!descriptor->is_socket()) if (!descriptor->is_socket())
return -ENOTSOCK; return -ENOTSOCK;
if (descriptor->socket_role() == SocketRole::Connected)
return -EISCONN;
auto& socket = *descriptor->socket(); auto& socket = *descriptor->socket();
descriptor->set_socket_role(SocketRole::Connecting); descriptor->set_socket_role(SocketRole::Connecting);
auto result = socket.connect(address, address_size); auto result = socket.connect(address, address_size);
if (result.is_error()) if (result.is_error()) {
descriptor->set_socket_role(SocketRole::None);
return result; return result;
}
descriptor->set_socket_role(SocketRole::Connected); descriptor->set_socket_role(SocketRole::Connected);
return 0; return 0;
} }