Skip to content
This repository has been archived by the owner on Nov 8, 2023. It is now read-only.

Commit

Permalink
Switch from using sockaddr to sockaddr_storage.
Browse files Browse the repository at this point in the history 
This is to ensure sufficient space is always available.

Change-Id: Ifa87b93ecdc90dcacbfb24446c872344da6703d3
  • Loading branch information
Erik Kline committed Dec 7, 2015
1 parent 1462c78 commit 7e16cc1
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 32 deletions.
4 changes: 2 additions & 2 deletions adb/adb_auth_client.cpp
View file
Expand Up @@ -228,13 +228,13 @@ void adb_auth_confirm_key(unsigned char *key, size_t len, atransport *t)

static void adb_auth_listener(int fd, unsigned events, void *data)
{
struct sockaddr addr;
sockaddr_storage addr;
socklen_t alen;
int s;

alen = sizeof(addr);

s = adb_socket_accept(fd, &addr, &alen);
s = adb_socket_accept(fd, reinterpret_cast<sockaddr*>(&addr), &alen);
if (s < 0) {
D("Failed to accept: errno=%d", errno);
return;
Expand Down
16 changes: 9 additions & 7 deletions adb/adb_listeners.cpp
View file
Expand Up @@ -34,9 +34,10 @@ static alistener listener_list = {

static void ss_listener_event_func(int _fd, unsigned ev, void *_l) {
if (ev & FDE_READ) {
struct sockaddr addr;
socklen_t alen = sizeof(addr);
int fd = adb_socket_accept(_fd, &addr, &alen);
sockaddr_storage ss;
sockaddr* addrp = reinterpret_cast<sockaddr*>(&ss);
socklen_t alen = sizeof(ss);
int fd = adb_socket_accept(_fd, addrp, &alen);
if (fd < 0) return;

int rcv_buf_size = CHUNK_SIZE;
Expand All @@ -58,12 +59,13 @@ static void listener_event_func(int _fd, unsigned ev, void* _l)
asocket *s;

if (ev & FDE_READ) {
struct sockaddr addr;
sockaddr_storage ss;
sockaddr* addrp = reinterpret_cast<sockaddr*>(&ss);
socklen_t alen;
int fd;

alen = sizeof(addr);
fd = adb_socket_accept(_fd, &addr, &alen);
alen = sizeof(ss);
fd = adb_socket_accept(_fd, addrp, &alen);
if (fd < 0) {
return;
}
Expand All @@ -79,7 +81,7 @@ static void listener_event_func(int _fd, unsigned ev, void* _l)
}
}

static void free_listener(alistener* l)
static void free_listener(alistener* l)
{
if (l->next) {
l->next->prev = l->prev;
Expand Down
23 changes: 12 additions & 11 deletions adb/jdwp_service.cpp
View file
Expand Up @@ -460,11 +460,11 @@ jdwp_control_init( JdwpControl* control,
const char* sockname,
int socknamelen )
{
struct sockaddr_un addr;
socklen_t addrlen;
int s;
int maxpath = sizeof(addr.sun_path);
int pathlen = socknamelen;
sockaddr_un addr;
socklen_t addrlen;
int s;
int maxpath = sizeof(addr.sun_path);
int pathlen = socknamelen;

if (pathlen >= maxpath) {
D( "vm debug control socket name too long (%d extra chars)",
Expand All @@ -485,7 +485,7 @@ jdwp_control_init( JdwpControl* control,

addrlen = (pathlen + sizeof(addr.sun_family));

if (bind(s, (struct sockaddr*)&addr, addrlen) < 0) {
if (bind(s, reinterpret_cast<sockaddr*>(&addr), addrlen) < 0) {
D( "could not bind vm debug control socket: %d: %s",
errno, strerror(errno) );
adb_close(s);
Expand Down Expand Up @@ -523,13 +523,14 @@ jdwp_control_event( int s, unsigned events, void* _control )
JdwpControl* control = (JdwpControl*) _control;

if (events & FDE_READ) {
struct sockaddr addr;
socklen_t addrlen = sizeof(addr);
int s = -1;
JdwpProcess* proc;
sockaddr_storage ss;
sockaddr* addrp = reinterpret_cast<sockaddr*>(&ss);
socklen_t addrlen = sizeof(ss);
int s = -1;
JdwpProcess* proc;

do {
s = adb_socket_accept( control->listen_socket, &addr, &addrlen );
s = adb_socket_accept(control->listen_socket, addrp, &addrlen);
if (s < 0) {
if (errno == EINTR)
continue;
Expand Down
7 changes: 4 additions & 3 deletions adb/transport_local.cpp
View file
Expand Up @@ -143,7 +143,8 @@ static void *client_socket_thread(void *x)
static void *server_socket_thread(void * arg)
{
int serverfd, fd;
struct sockaddr addr;
sockaddr_storage ss;
sockaddr *addrp = reinterpret_cast<sockaddr*>(&ss);
socklen_t alen;
int port = (int) (uintptr_t) arg;

Expand All @@ -162,9 +163,9 @@ static void *server_socket_thread(void * arg)
close_on_exec(serverfd);
}

alen = sizeof(addr);
alen = sizeof(ss);
D("server: trying to get new connection from %d", port);
fd = adb_socket_accept(serverfd, &addr, &alen);
fd = adb_socket_accept(serverfd, addrp, &alen);
if(fd >= 0) {
D("server: new connection on fd %d", fd);
close_on_exec(fd);
Expand Down
7 changes: 4 additions & 3 deletions debuggerd/debuggerd.cpp
View file
Expand Up @@ -518,11 +518,12 @@ static int do_server() {
ALOGI("debuggerd: starting\n");

for (;;) {
sockaddr addr;
socklen_t alen = sizeof(addr);
sockaddr_storage ss;
sockaddr* addrp = reinterpret_cast<sockaddr*>(&ss);
socklen_t alen = sizeof(ss);

ALOGV("waiting for connection\n");
int fd = accept(s, &addr, &alen);
int fd = accept(s, addrp, &alen);
if (fd < 0) {
ALOGV("accept failed: %s\n", strerror(errno));
continue;
Expand Down
7 changes: 4 additions & 3 deletions libsysutils/src/SocketListener.cpp
View file
Expand Up @@ -199,13 +199,14 @@ void SocketListener::runListener() {
continue;
}
if (mListen && FD_ISSET(mSock, &read_fds)) {
struct sockaddr addr;
sockaddr_storage ss;
sockaddr* addrp = reinterpret_cast<sockaddr*>(&ss);
socklen_t alen;
int c;

do {
alen = sizeof(addr);
c = accept(mSock, &addr, &alen);
alen = sizeof(ss);
c = accept(mSock, addrp, &alen);
SLOGV("%s got %d from accept", mSocketName, c);
} while (c < 0 && errno == EINTR);
if (c < 0) {
Expand Down
7 changes: 4 additions & 3 deletions lmkd/lmkd.c
View file
Expand Up @@ -410,7 +410,8 @@ static void ctrl_data_handler(uint32_t events) {
}

static void ctrl_connect_handler(uint32_t events __unused) {
struct sockaddr addr;
struct sockaddr_storage ss;
struct sockaddr *addrp = (struct sockaddr *)&ss;
socklen_t alen;
struct epoll_event epev;

Expand All @@ -419,8 +420,8 @@ static void ctrl_connect_handler(uint32_t events __unused) {
ctrl_dfd_reopened = 1;
}

alen = sizeof(addr);
ctrl_dfd = accept(ctrl_lfd, &addr, &alen);
alen = sizeof(ss);
ctrl_dfd = accept(ctrl_lfd, addrp, &alen);

if (ctrl_dfd < 0) {
ALOGE("lmkd control socket accept failed; errno=%d", errno);
Expand Down

0 comments on commit 7e16cc1

Please sign in to comment.