maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Calculate size of sockaddr_un manually for abstract sockets: 

- SUN_LEN doesn't work because strlen(sun_path) == 0
 - sizeof(sockaddr_un) doesn't work on Android.

llvm-svn: 251825
This commit is contained in:
Oleksiy Vyalov 2015-11-02 20:04:18 +00:00
parent f83834feb1
commit 7e02139dfc
1 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,29 +11,50 @@
#include "lldb/Host/FileSystem.h" #include "lldb/Host/FileSystem.h"
#include <stddef.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/un.h> #include <sys/un.h>
using namespace lldb; using namespace lldb;
using namespace lldb_private; using namespace lldb_private;
#ifdef __ANDROID__
// Android does not have SUN_LEN
#ifndef SUN_LEN
#define SUN_LEN(ptr) ((size_t) (((struct sockaddr_un *) 0)->sun_path) + strlen((ptr)->sun_path))
#endif
#endif // #ifdef __ANDROID__
namespace { namespace {
const int kDomain = AF_UNIX; const int kDomain = AF_UNIX;
const int kType = SOCK_STREAM; const int kType = SOCK_STREAM;
bool SetSockAddr(llvm::StringRef name, const size_t name_offset, sockaddr_un* saddr_un) bool SetSockAddr(llvm::StringRef name,
const size_t name_offset,
sockaddr_un* saddr_un,
socklen_t& saddr_un_len)
{ {
if (name.size() + name_offset > sizeof(saddr_un->sun_path)) if (name.size() + name_offset > sizeof(saddr_un->sun_path))
return false; return false;
memset(saddr_un, 0, sizeof(*saddr_un));
saddr_un->sun_family = kDomain; saddr_un->sun_family = kDomain;
memset(saddr_un->sun_path, 0, sizeof(saddr_un->sun_path));
strncpy(&saddr_un->sun_path[name_offset], name.data(), name.size()); memcpy(saddr_un->sun_path + name_offset, name.data(), name.size());
// For domain sockets we can use SUN_LEN in order to calculate size of
// sockaddr_un, but for abstract sockets we have to calculate size manually
// because of leading null symbol.
if (name_offset == 0)
saddr_un_len = SUN_LEN(saddr_un);
else
saddr_un_len = offsetof(struct sockaddr_un, sun_path) + name_offset + name.size();
#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) #if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__)
saddr_un->sun_len = SUN_LEN (saddr_un); saddr_un->sun_len = saddr_un_len;
#endif #endif
return true; return true;
} }
@ -58,11 +79,12 @@ Error
DomainSocket::Connect(llvm::StringRef name) DomainSocket::Connect(llvm::StringRef name)
{ {
sockaddr_un saddr_un; sockaddr_un saddr_un;
if (!SetSockAddr(name, GetNameOffset(), &saddr_un)) socklen_t saddr_un_len;
if (!SetSockAddr(name, GetNameOffset(), &saddr_un, saddr_un_len))
return Error("Failed to set socket address"); return Error("Failed to set socket address");
Error error; Error error;
if (::connect(GetNativeSocket(), (struct sockaddr *)&saddr_un, sizeof(saddr_un)) < 0) if (::connect(GetNativeSocket(), (struct sockaddr *)&saddr_un, saddr_un_len) < 0)
SetLastError (error); SetLastError (error);
return error; return error;
@ -72,13 +94,14 @@ Error
DomainSocket::Listen(llvm::StringRef name, int backlog) DomainSocket::Listen(llvm::StringRef name, int backlog)
{ {
sockaddr_un saddr_un; sockaddr_un saddr_un;
if (!SetSockAddr(name, GetNameOffset(), &saddr_un)) socklen_t saddr_un_len;
if (!SetSockAddr(name, GetNameOffset(), &saddr_un, saddr_un_len))
return Error("Failed to set socket address"); return Error("Failed to set socket address");
DeleteSocketFile(name); DeleteSocketFile(name);
Error error; Error error;
if (::bind(GetNativeSocket(), (struct sockaddr *)&saddr_un, sizeof(saddr_un)) == 0) if (::bind(GetNativeSocket(), (struct sockaddr *)&saddr_un, saddr_un_len) == 0)
if (::listen(GetNativeSocket(), backlog) == 0) if (::listen(GetNativeSocket(), backlog) == 0)
return error; return error;