OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

[lldb] Fix DomainSocket::GetSocketName for unnamed sockets 

getpeername will return addrlen = 2 (sizeof sa_family_t) for unnamed
sockets (those not assigned a name with bind(2)). This is typically true
for client sockets as well as those created by socketpair(2).

This GetSocketName used to crash for sockets which were connected to
these kinds of sockets. Now it returns an empty string.
This commit is contained in:
Pavel Labath 2021-09-23 11:31:33 +02:00
parent e7c879a69d
commit 5685eb950d
2 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
lldb/source/Host/posix/DomainSocket.cpp
View File

@ -127,29 +127,34 @@ void DomainSocket::DeleteSocketFile(llvm::StringRef name) {
}
std::string DomainSocket::GetSocketName() const {
if (m_socket != kInvalidSocketValue) {
struct sockaddr_un saddr_un;
saddr_un.sun_family = AF_UNIX;
socklen_t sock_addr_len = sizeof(struct sockaddr_un);
if (::getpeername(m_socket, (struct sockaddr *)&saddr_un, &sock_addr_len) ==
0) {
std::string name(saddr_un.sun_path + GetNameOffset(),
sock_addr_len -
offsetof(struct sockaddr_un, sun_path) -
if (m_socket == kInvalidSocketValue)
return "";
struct sockaddr_un saddr_un;
saddr_un.sun_family = AF_UNIX;
socklen_t sock_addr_len = sizeof(struct sockaddr_un);
if (::getpeername(m_socket, (struct sockaddr *)&saddr_un, &sock_addr_len) !=
0)
return "";
if (sock_addr_len <= offsetof(struct sockaddr_un, sun_path))
return ""; // Unnamed domain socket
llvm::StringRef name(saddr_un.sun_path + GetNameOffset(),
sock_addr_len - offsetof(struct sockaddr_un, sun_path) -
GetNameOffset());
if (name.back() == '\0') name.pop_back();
return name;
}
}
return "";
if (name.back() == '\0')
name = name.drop_back();
return name.str();
}
std::string DomainSocket::GetRemoteConnectionURI() const {
if (m_socket != kInvalidSocketValue) {
return std::string(llvm::formatv(
"{0}://{1}",
GetNameOffset() == 0 ? "unix-connect" : "unix-abstract-connect",
GetSocketName()));
}
return "";
std::string name = GetSocketName();
if (name.empty())
return name;
return llvm::formatv(
"{0}://{1}",
GetNameOffset() == 0 ? "unix-connect" : "unix-abstract-connect", name);
}

2
lldb/unittests/Host/SocketTest.cpp
View File

@ -225,6 +225,8 @@ TEST_P(SocketTest, DomainGetConnectURI) {
EXPECT_TRUE(UriParser::Parse(uri, scheme, hostname, port, path));
EXPECT_EQ(scheme, "unix-connect");
EXPECT_EQ(path, domain_path);
EXPECT_EQ(socket_b_up->GetRemoteConnectionURI(), "");
}
#endif