diff options
author | Elliott Hughes | 2016-08-23 18:03:20 -0500 |
---|---|---|
committer | android-build-merger | 2016-08-23 18:03:20 -0500 |
commit | 8615d79d85e53c86028b702152bc00864b18f9d5 (patch) | |
tree | 65afa58c78ea612d8824729717ce18654b4a10ff /lmkd | |
parent | 504d4ccd7cc27806781af880cb2479075c11ad30 (diff) | |
parent | 299d64144bdf28b06489c64aa4e99c423b84c1c4 (diff) | |
download | platform-system-core-8615d79d85e53c86028b702152bc00864b18f9d5.tar.gz platform-system-core-8615d79d85e53c86028b702152bc00864b18f9d5.tar.xz platform-system-core-8615d79d85e53c86028b702152bc00864b18f9d5.zip |
Merge "Most accept/accept4 calls in system/core don't actually want the remote address."
am: 299d64144b
Change-Id: I3fb9678dfed08f0b1d6e90e547ecae6cdcabc9a1
Diffstat (limited to 'lmkd')
-rw-r--r-- | lmkd/lmkd.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lmkd/lmkd.c b/lmkd/lmkd.c index e404e4483..df1b9afbd 100644 --- a/lmkd/lmkd.c +++ b/lmkd/lmkd.c | |||
@@ -397,9 +397,6 @@ static void ctrl_data_handler(uint32_t events) { | |||
397 | } | 397 | } |
398 | 398 | ||
399 | static void ctrl_connect_handler(uint32_t events __unused) { | 399 | static void ctrl_connect_handler(uint32_t events __unused) { |
400 | struct sockaddr_storage ss; | ||
401 | struct sockaddr *addrp = (struct sockaddr *)&ss; | ||
402 | socklen_t alen; | ||
403 | struct epoll_event epev; | 400 | struct epoll_event epev; |
404 | 401 | ||
405 | if (ctrl_dfd >= 0) { | 402 | if (ctrl_dfd >= 0) { |
@@ -407,8 +404,7 @@ static void ctrl_connect_handler(uint32_t events __unused) { | |||
407 | ctrl_dfd_reopened = 1; | 404 | ctrl_dfd_reopened = 1; |
408 | } | 405 | } |
409 | 406 | ||
410 | alen = sizeof(ss); | 407 | ctrl_dfd = accept(ctrl_lfd, NULL, NULL); |
411 | ctrl_dfd = accept(ctrl_lfd, addrp, &alen); | ||
412 | 408 | ||
413 | if (ctrl_dfd < 0) { | 409 | if (ctrl_dfd < 0) { |
414 | ALOGE("lmkd control socket accept failed; errno=%d", errno); | 410 | ALOGE("lmkd control socket accept failed; errno=%d", errno); |