ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "liblog: add a timeout for logd command socket operations"

Browse source
This commit is contained in:
Tom Cherry 2020-08-05 19:18:07 +00:00 • committed by Gerrit Code Review
commit 368c70daba
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
liblog/logd_reader.cpp
View file

@ -41,7 +41,7 @@
// Connects to /dev/socket/<name> and returns the associated fd or returns -1 on error.
// O_CLOEXEC is always set.
static int socket_local_client(const std::string& name, int type) {
static int socket_local_client(const std::string& name, int type, bool timeout) {
sockaddr_un addr = {.sun_family = AF_LOCAL};
std::string path = "/dev/socket/" + name;
@ -55,6 +55,18 @@ static int socket_local_client(const std::string& name, int type) {
return -1;
}
if (timeout) {
// Sending and receiving messages should be instantaneous, but we don't want to wait forever if
// logd is hung, so we set a gracious 2s timeout.
struct timeval t = {2, 0};
if (setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &t, sizeof(t)) == -1) {
return -1;
}
if (setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &t, sizeof(t)) == -1) {
return -1;
}
}
if (connect(fd, reinterpret_cast<sockaddr*>(&addr), sizeof(addr)) == -1) {
close(fd);
return -1;
@ -69,7 +81,7 @@ ssize_t SendLogdControlMessage(char* buf, size_t buf_size) {
size_t len;
char* cp;
int errno_save = 0;
int sock = socket_local_client("logd", SOCK_STREAM);
int sock = socket_local_client("logd", SOCK_STREAM, true);
if (sock < 0) {
return sock;
}
@ -268,7 +280,7 @@ static int logdOpen(struct logger_list* logger_list) {
return sock;
}
sock = socket_local_client("logdr", SOCK_SEQPACKET);
sock = socket_local_client("logdr", SOCK_SEQPACKET, false);
if (sock <= 0) {
if ((sock == -1) && errno) {
return -errno;