diff --git a/Kernel/Net/IPv4Socket.cpp b/Kernel/Net/IPv4Socket.cpp index 5cc3b6e3b0..47f1589c55 100644 --- a/Kernel/Net/IPv4Socket.cpp +++ b/Kernel/Net/IPv4Socket.cpp @@ -98,7 +98,7 @@ void IPv4Socket::get_peer_address(sockaddr* address, socklen_t* address_size) *address_size = sizeof(sockaddr_in); } -KResult IPv4Socket::bind(const sockaddr* user_address, socklen_t address_size) +KResult IPv4Socket::bind(Userspace user_address, socklen_t address_size) { ASSERT(setup_state() == SetupState::Unstarted); if (address_size != sizeof(sockaddr_in)) diff --git a/Kernel/Net/IPv4Socket.h b/Kernel/Net/IPv4Socket.h index 7a94f6df8a..0f7f278ab6 100644 --- a/Kernel/Net/IPv4Socket.h +++ b/Kernel/Net/IPv4Socket.h @@ -49,7 +49,7 @@ public: static Lockable>& all_sockets(); virtual KResult close() override; - virtual KResult bind(const sockaddr*, socklen_t) override; + virtual KResult bind(Userspace, socklen_t) override; virtual KResult connect(FileDescription&, const sockaddr*, socklen_t, ShouldBlock = ShouldBlock::Yes) override; virtual KResult listen(size_t) override; virtual void get_local_address(sockaddr*, socklen_t*) override; diff --git a/Kernel/Net/LocalSocket.cpp b/Kernel/Net/LocalSocket.cpp index 77c7308718..fb7d311753 100644 --- a/Kernel/Net/LocalSocket.cpp +++ b/Kernel/Net/LocalSocket.cpp @@ -91,7 +91,7 @@ void LocalSocket::get_peer_address(sockaddr* address, socklen_t* address_size) get_local_address(address, address_size); } -KResult LocalSocket::bind(const sockaddr* user_address, socklen_t address_size) +KResult LocalSocket::bind(Userspace user_address, socklen_t address_size) { ASSERT(setup_state() == SetupState::Unstarted); if (address_size != sizeof(sockaddr_un)) diff --git a/Kernel/Net/LocalSocket.h b/Kernel/Net/LocalSocket.h index 60f5e2a52d..63821d2962 100644 --- a/Kernel/Net/LocalSocket.h +++ b/Kernel/Net/LocalSocket.h @@ -51,7 +51,7 @@ public: String absolute_path(const FileDescription& description) const override; // ^Socket - virtual KResult bind(const sockaddr*, socklen_t) override; + virtual KResult bind(Userspace, socklen_t) override; virtual KResult connect(FileDescription&, const sockaddr*, socklen_t, ShouldBlock = ShouldBlock::Yes) override; virtual KResult listen(size_t) override; virtual void get_local_address(sockaddr*, socklen_t*) override; diff --git a/Kernel/Net/Socket.h b/Kernel/Net/Socket.h index 810310ed1a..8d043fc614 100644 --- a/Kernel/Net/Socket.h +++ b/Kernel/Net/Socket.h @@ -98,7 +98,7 @@ public: KResult shutdown(int how); - virtual KResult bind(const sockaddr*, socklen_t) = 0; + virtual KResult bind(Userspace, socklen_t) = 0; virtual KResult connect(FileDescription&, const sockaddr*, socklen_t, ShouldBlock) = 0; virtual KResult listen(size_t) = 0; virtual void get_local_address(sockaddr*, socklen_t*) = 0; diff --git a/Kernel/Process.h b/Kernel/Process.h index c32adf8762..13efccd7aa 100644 --- a/Kernel/Process.h +++ b/Kernel/Process.h @@ -291,7 +291,7 @@ public: int sys$chown(Userspace); int sys$fchown(int fd, uid_t, gid_t); int sys$socket(int domain, int type, int protocol); - int sys$bind(int sockfd, const sockaddr* addr, socklen_t); + int sys$bind(int sockfd, Userspace addr, socklen_t); int sys$listen(int sockfd, int backlog); int sys$accept(int sockfd, sockaddr*, socklen_t*); int sys$connect(int sockfd, const sockaddr*, socklen_t); diff --git a/Kernel/Syscalls/socket.cpp b/Kernel/Syscalls/socket.cpp index 0793be8669..f63b870f31 100644 --- a/Kernel/Syscalls/socket.cpp +++ b/Kernel/Syscalls/socket.cpp @@ -63,7 +63,7 @@ int Process::sys$socket(int domain, int type, int protocol) return fd; } -int Process::sys$bind(int sockfd, const sockaddr* address, socklen_t address_length) +int Process::sys$bind(int sockfd, Userspace address, socklen_t address_length) { if (!validate_read(address, address_length)) return -EFAULT;