adb: check our socketpair ends in our win32 emulation.
In our Win32 socketpair emulation, check that the ends are properly
connected before returning.
Change-Id: I33d356fd9ebcac89fc6a89a5200e926032220383
Test: no additional failing tests in adb_test.exe
diff --git a/adb/sysdeps.h b/adb/sysdeps.h
index 333b861..322f992 100644
--- a/adb/sysdeps.h
+++ b/adb/sysdeps.h
@@ -285,6 +285,10 @@
#undef accept
#define accept ___xxx_accept
+int adb_getsockname(int fd, struct sockaddr* sockaddr, socklen_t* optlen);
+#undef getsockname
+#define getsockname(...) ___xxx_getsockname(__VA__ARGS__)
+
// Returns the local port number of a bound socket, or -1 on failure.
int adb_socket_get_local_port(int fd);
diff --git a/adb/sysdeps_win32.cpp b/adb/sysdeps_win32.cpp
index 109a548..5fda27b 100644
--- a/adb/sysdeps_win32.cpp
+++ b/adb/sysdeps_win32.cpp
@@ -1061,7 +1061,7 @@
return -1;
}
- int result = getsockname(fh->fh_socket, sockaddr, optlen);
+ int result = (getsockname)(fh->fh_socket, sockaddr, optlen);
if (result == SOCKET_ERROR) {
const DWORD err = WSAGetLastError();
D("adb_getsockname: setsockopt on fd %d failed: %s\n", fd,
@@ -1119,6 +1119,11 @@
int local_port = -1;
std::string error;
+ struct sockaddr_storage peer_addr = {};
+ struct sockaddr_storage client_addr = {};
+ socklen_t peer_socklen = sizeof(peer_addr);
+ socklen_t client_socklen = sizeof(client_addr);
+
server = network_loopback_server(0, SOCK_STREAM, &error);
if (server < 0) {
D("adb_socketpair: failed to create server: %s", error.c_str());
@@ -1138,12 +1143,32 @@
goto fail;
}
- accepted = adb_socket_accept(server, nullptr, nullptr);
+ // Make sure that the peer that connected to us and the client are the same.
+ accepted = adb_socket_accept(server, reinterpret_cast<sockaddr*>(&peer_addr), &peer_socklen);
if (accepted < 0) {
D("adb_socketpair: failed to accept: %s", strerror(errno));
goto fail;
}
+
+ if (adb_getsockname(client, reinterpret_cast<sockaddr*>(&client_addr), &client_socklen) != 0) {
+ D("adb_socketpair: failed to getpeername: %s", strerror(errno));
+ goto fail;
+ }
+
+ if (peer_socklen != client_socklen) {
+ D("adb_socketpair: client and peer sockaddrs have different lengths");
+ errno = EIO;
+ goto fail;
+ }
+
+ if (memcmp(&peer_addr, &client_addr, peer_socklen) != 0) {
+ D("adb_socketpair: client and peer sockaddrs don't match");
+ errno = EIO;
+ goto fail;
+ }
+
adb_close(server);
+
sv[0] = client;
sv[1] = accepted;
return 0;