VERY experimental Nintendo Switch 2 emulator
C++
sockets: use safe access helpers
Liam3ecf82aa6260
diff --git a/src/core/hle/service/sockets/bsd.cpp b/src/core/hle/service/sockets/bsd.cppindex 85849d5f37..dd652ca421 100644--- a/src/core/hle/service/sockets/bsd.cpp+++ b/src/core/hle/service/sockets/bsd.cpp@@ -39,6 +39,18 @@ bool IsConnectionBased(Type type) {}}+template <typename T>+T GetValue(std::span<const u8> buffer) {+ T t{};+ std::memcpy(&t, buffer.data(), std::min(sizeof(T), buffer.size()));+ return t;+}++template <typename T>+void PutValue(std::span<u8> buffer, const T& t) {+ std::memcpy(buffer.data(), &t, std::min(sizeof(T), buffer.size()));+}+} // Anonymous namespacevoid BSD::PollWork::Execute(BSD* bsd) {@@ -316,22 +328,12 @@ void BSD::SetSockOpt(HLERequestContext& ctx) {const s32 fd = rp.Pop<s32>();const u32 level = rp.Pop<u32>();const OptName optname = static_cast<OptName>(rp.Pop<u32>());-- const auto buffer = ctx.ReadBuffer();- const u8* optval = buffer.empty() ? nullptr : buffer.data();- size_t optlen = buffer.size();-- std::array<u64, 2> values;- if ((optname == OptName::SNDTIMEO || optname == OptName::RCVTIMEO) && buffer.size() == 8) {- std::memcpy(values.data(), buffer.data(), sizeof(values));- optlen = sizeof(values);- optval = reinterpret_cast<const u8*>(values.data());- }+ const auto optval = ctx.ReadBuffer();LOG_DEBUG(Service, "called. fd={} level={} optname=0x{:x} optlen={}", fd, level,- static_cast<u32>(optname), optlen);+ static_cast<u32>(optname), optval.size());- BuildErrnoResponse(ctx, SetSockOptImpl(fd, level, optname, optlen, optval));+ BuildErrnoResponse(ctx, SetSockOptImpl(fd, level, optname, optval));}void BSD::Shutdown(HLERequestContext& ctx) {@@ -521,18 +523,19 @@ std::pair<s32, Errno> BSD::SocketImpl(Domain domain, Type type, Protocol protocostd::pair<s32, Errno> BSD::PollImpl(std::vector<u8>& write_buffer, std::span<const u8> read_buffer,s32 nfds, s32 timeout) {- if (write_buffer.size() < nfds * sizeof(PollFD)) {- return {-1, Errno::INVAL};- }-- if (nfds == 0) {+ if (nfds <= 0) {// When no entries are provided, -1 is returned with errno zeroreturn {-1, Errno::SUCCESS};}+ if (read_buffer.size() < nfds * sizeof(PollFD)) {+ return {-1, Errno::INVAL};+ }+ if (write_buffer.size() < nfds * sizeof(PollFD)) {+ return {-1, Errno::INVAL};+ }- const size_t length = std::min(read_buffer.size(), write_buffer.size());std::vector<PollFD> fds(nfds);- std::memcpy(fds.data(), read_buffer.data(), length);+ std::memcpy(fds.data(), read_buffer.data(), nfds * sizeof(PollFD));if (timeout >= 0) {const s64 seconds = timeout / 1000;@@ -580,7 +583,7 @@ std::pair<s32, Errno> BSD::PollImpl(std::vector<u8>& write_buffer, std::span<confor (size_t i = 0; i < num; ++i) {fds[i].revents = Translate(host_pollfds[i].revents);}- std::memcpy(write_buffer.data(), fds.data(), length);+ std::memcpy(write_buffer.data(), fds.data(), nfds * sizeof(PollFD));return Translate(result);}@@ -608,8 +611,7 @@ std::pair<s32, Errno> BSD::AcceptImpl(s32 fd, std::vector<u8>& write_buffer) {new_descriptor.is_connection_based = descriptor.is_connection_based;const SockAddrIn guest_addr_in = Translate(result.sockaddr_in);- const size_t length = std::min(sizeof(guest_addr_in), write_buffer.size());- std::memcpy(write_buffer.data(), &guest_addr_in, length);+ PutValue(write_buffer, guest_addr_in);return {new_fd, Errno::SUCCESS};}@@ -619,8 +621,7 @@ Errno BSD::BindImpl(s32 fd, std::span<const u8> addr) {return Errno::BADF;}ASSERT(addr.size() == sizeof(SockAddrIn));- SockAddrIn addr_in;- std::memcpy(&addr_in, addr.data(), sizeof(addr_in));+ auto addr_in = GetValue<SockAddrIn>(addr);return Translate(file_descriptors[fd]->socket->Bind(Translate(addr_in)));}@@ -631,8 +632,7 @@ Errno BSD::ConnectImpl(s32 fd, std::span<const u8> addr) {}UNIMPLEMENTED_IF(addr.size() != sizeof(SockAddrIn));- SockAddrIn addr_in;- std::memcpy(&addr_in, addr.data(), sizeof(addr_in));+ auto addr_in = GetValue<SockAddrIn>(addr);return Translate(file_descriptors[fd]->socket->Connect(Translate(addr_in)));}@@ -650,7 +650,7 @@ Errno BSD::GetPeerNameImpl(s32 fd, std::vector<u8>& write_buffer) {ASSERT(write_buffer.size() >= sizeof(guest_addrin));write_buffer.resize(sizeof(guest_addrin));- std::memcpy(write_buffer.data(), &guest_addrin, sizeof(guest_addrin));+ PutValue(write_buffer, guest_addrin);return Translate(bsd_errno);}@@ -667,7 +667,7 @@ Errno BSD::GetSockNameImpl(s32 fd, std::vector<u8>& write_buffer) {ASSERT(write_buffer.size() >= sizeof(guest_addrin));write_buffer.resize(sizeof(guest_addrin));- std::memcpy(write_buffer.data(), &guest_addrin, sizeof(guest_addrin));+ PutValue(write_buffer, guest_addrin);return Translate(bsd_errno);}@@ -725,7 +725,7 @@ Errno BSD::GetSockOptImpl(s32 fd, u32 level, OptName optname, std::vector<u8>& ooptval.size() == sizeof(Errno), { return Errno::INVAL; },"Incorrect getsockopt option size");optval.resize(sizeof(Errno));- memcpy(optval.data(), &translated_pending_err, sizeof(Errno));+ PutValue(optval, translated_pending_err);}return Translate(getsockopt_err);}@@ -735,7 +735,7 @@ Errno BSD::GetSockOptImpl(s32 fd, u32 level, OptName optname, std::vector<u8>& o}}-Errno BSD::SetSockOptImpl(s32 fd, u32 level, OptName optname, size_t optlen, const void* optval) {+Errno BSD::SetSockOptImpl(s32 fd, u32 level, OptName optname, std::span<const u8> optval) {if (!IsFileDescriptorValid(fd)) {return Errno::BADF;}@@ -748,17 +748,15 @@ Errno BSD::SetSockOptImpl(s32 fd, u32 level, OptName optname, size_t optlen, conNetwork::SocketBase* const socket = file_descriptors[fd]->socket.get();if (optname == OptName::LINGER) {- ASSERT(optlen == sizeof(Linger));- Linger linger;- std::memcpy(&linger, optval, sizeof(linger));+ ASSERT(optval.size() == sizeof(Linger));+ auto linger = GetValue<Linger>(optval);ASSERT(linger.onoff == 0 || linger.onoff == 1);return Translate(socket->SetLinger(linger.onoff != 0, linger.linger));}- ASSERT(optlen == sizeof(u32));- u32 value;- std::memcpy(&value, optval, sizeof(value));+ ASSERT(optval.size() == sizeof(u32));+ auto value = GetValue<u32>(optval);switch (optname) {case OptName::REUSEADDR:@@ -862,7 +860,7 @@ std::pair<s32, Errno> BSD::RecvFromImpl(s32 fd, u32 flags, std::vector<u8>& mess} else {ASSERT(addr.size() == sizeof(SockAddrIn));const SockAddrIn result = Translate(addr_in);- std::memcpy(addr.data(), &result, sizeof(result));+ PutValue(addr, result);}}@@ -886,8 +884,7 @@ std::pair<s32, Errno> BSD::SendToImpl(s32 fd, u32 flags, std::span<const u8> mesNetwork::SockAddrIn* p_addr_in = nullptr;if (!addr.empty()) {ASSERT(addr.size() == sizeof(SockAddrIn));- SockAddrIn guest_addr_in;- std::memcpy(&guest_addr_in, addr.data(), sizeof(guest_addr_in));+ auto guest_addr_in = GetValue<SockAddrIn>(addr);addr_in = Translate(guest_addr_in);p_addr_in = &addr_in;}diff --git a/src/core/hle/service/sockets/bsd.h b/src/core/hle/service/sockets/bsd.hindex 161f22b9b1..4f69d382c9 100644--- a/src/core/hle/service/sockets/bsd.h+++ b/src/core/hle/service/sockets/bsd.h@@ -163,7 +163,7 @@ private:Errno ListenImpl(s32 fd, s32 backlog);std::pair<s32, Errno> FcntlImpl(s32 fd, FcntlCmd cmd, s32 arg);Errno GetSockOptImpl(s32 fd, u32 level, OptName optname, std::vector<u8>& optval);- Errno SetSockOptImpl(s32 fd, u32 level, OptName optname, size_t optlen, const void* optval);+ Errno SetSockOptImpl(s32 fd, u32 level, OptName optname, std::span<const u8> optval);Errno ShutdownImpl(s32 fd, s32 how);std::pair<s32, Errno> RecvImpl(s32 fd, u32 flags, std::vector<u8>& message);std::pair<s32, Errno> RecvFromImpl(s32 fd, u32 flags, std::vector<u8>& message,