am 93951cfa: Merge "Fix a couple more cases of missing CLOEXEC."

* commit '93951cfa96c3c7504a78f94e7ec408936e5db9bf':
  Fix a couple more cases of missing CLOEXEC.
This commit is contained in:
Elliott Hughes 2014-09-23 01:40:10 +00:00 committed by Android Git Automerger
commit 5d953ddd40
2 changed files with 3 additions and 3 deletions

View File

@ -471,8 +471,8 @@ static const prop_info *find_property(prop_bt *const trie, const char *name,
static int send_prop_msg(const prop_msg *msg)
{
const int fd = socket(AF_LOCAL, SOCK_STREAM, 0);
if (fd < 0) {
const int fd = socket(AF_LOCAL, SOCK_STREAM | SOCK_CLOEXEC, 0);
if (fd == -1) {
return -1;
}

View File

@ -215,7 +215,7 @@ static void send_debuggerd_packet(siginfo_t* info) {
return;
}
int s = socket_abstract_client(DEBUGGER_SOCKET_NAME, SOCK_STREAM);
int s = socket_abstract_client(DEBUGGER_SOCKET_NAME, SOCK_STREAM | SOCK_CLOEXEC);
if (s == -1) {
__libc_format_log(ANDROID_LOG_FATAL, "libc", "Unable to open connection to debuggerd: %s",
strerror(errno));