commit ae973d5980e0d3c7a8143a78aad019486c46914c
author Sharvil Nanavati <sharvil@google.com> Mon Jun 20 19:16:12 2016 -0700
committer Dirk Vogt <dirk@fairphone.com> Tue Jun 20 11:01:19 2017 +0200
tree dc40ab55eddabd6e1245638bd17ec29ffedde331
parent 130b40b95840d85c076923920e481a86f0144f23

DO NOT MERGE Fix potential DoS caused by delivering signal to BT process

FPIIM-1270
FPIIM-1268

Bug: 28885210
Change-Id: I63866d894bfca47464d6e42e3fb0357c4f94d360

tools/hci/main.c

diff --git a/tools/hci/main.c b/tools/hci/main.c
index fc433bc..97fbef1 100644
--- a/tools/hci/main.c
+++ b/tools/hci/main.c
@@ -1,3 +1,4 @@
+#include <errno.h>
 #include <hardware/bluetooth.h>
 #include <netinet/in.h>
 #include <stdio.h>
@@ -149,16 +150,16 @@
   addr.sin_family = AF_INET;
   addr.sin_addr.s_addr = htonl(0x7F000001);
   addr.sin_port = htons(8873);
-  if (connect(sock, (const struct sockaddr *)&addr, sizeof(addr)) == -1)
+  if (TEMP_FAILURE_RETRY(connect(sock, (const struct sockaddr *)&addr, sizeof(addr))) == -1)
     goto error;
 
-  if (send(sock, &type, 1, 0) != 1)
+  if (TEMP_FAILURE_RETRY(send(sock, &type, 1, 0)) != 1)
     goto error;
 
-  if (send(sock, &length, 2, 0) != 2)
+  if (TEMP_FAILURE_RETRY(send(sock, &length, 2, 0)) != 2)
     goto error;
 
-  if (send(sock, packet, length, 0) != (ssize_t)length)
+  if (TEMP_FAILURE_RETRY(send(sock, packet, length, 0)) != (ssize_t)length)
     goto error;
 
   close(sock);