summaryrefslogtreecommitdiffstats
path: root/osi/src/socket.c
diff options
context:
space:
mode:
authorSharvil Nanavati <sharvil@google.com>2016-06-20 19:16:12 -0700
committerJessica Wagantall <jwagantall@cyngn.com>2016-08-02 01:12:33 -0700
commit791c2192a9a19e42d8a396b0e46e1b15feb542cb (patch)
tree32c97666df9efaadc8206ea0499cf2480d2b8829 /osi/src/socket.c
parent0e94bd5ac42a4621c873c8c2af4aa2aced3c6442 (diff)
downloadandroid_system_bt-791c2192a9a19e42d8a396b0e46e1b15feb542cb.tar.gz
android_system_bt-791c2192a9a19e42d8a396b0e46e1b15feb542cb.tar.bz2
android_system_bt-791c2192a9a19e42d8a396b0e46e1b15feb542cb.zip
Fix potential DoS caused by delivering signal to BT processstable/cm-13.0-ZNH2K
Ticket: CYNGNOS-3177 Bug: 28885210 Change-Id: I63866d894bfca47464d6e42e3fb0357c4f94d360
Diffstat (limited to 'osi/src/socket.c')
-rw-r--r--osi/src/socket.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/osi/src/socket.c b/osi/src/socket.c
index 91f084e79..9905ae300 100644
--- a/osi/src/socket.c
+++ b/osi/src/socket.c
@@ -121,7 +121,7 @@ bool socket_listen(const socket_t *socket, port_t port) {
socket_t *socket_accept(const socket_t *socket) {
assert(socket != NULL);
- int fd = accept(socket->fd, NULL, NULL);
+ int fd = TEMP_FAILURE_RETRY(accept(socket->fd, NULL, NULL));
if (fd == INVALID_FD) {
LOG_ERROR("%s unable to accept socket: %s", __func__, strerror(errno));
return NULL;
@@ -142,14 +142,14 @@ ssize_t socket_read(const socket_t *socket, void *buf, size_t count) {
assert(socket != NULL);
assert(buf != NULL);
- return recv(socket->fd, buf, count, MSG_DONTWAIT);
+ return TEMP_FAILURE_RETRY(recv(socket->fd, buf, count, MSG_DONTWAIT));
}
ssize_t socket_write(const socket_t *socket, const void *buf, size_t count) {
assert(socket != NULL);
assert(buf != NULL);
- return send(socket->fd, buf, count, MSG_DONTWAIT);
+ return TEMP_FAILURE_RETRY(send(socket->fd, buf, count, MSG_DONTWAIT));
}
ssize_t socket_write_and_transfer_fd(const socket_t *socket, const void *buf, size_t count, int fd) {
@@ -179,7 +179,7 @@ ssize_t socket_write_and_transfer_fd(const socket_t *socket, const void *buf, si
header->cmsg_len = CMSG_LEN(sizeof(int));
*(int *)CMSG_DATA(header) = fd;
- ssize_t ret = sendmsg(socket->fd, &msg, MSG_DONTWAIT);
+ ssize_t ret = TEMP_FAILURE_RETRY(sendmsg(socket->fd, &msg, MSG_DONTWAIT));
close(fd);
return ret;
}
@@ -188,7 +188,7 @@ ssize_t socket_bytes_available(const socket_t *socket) {
assert(socket != NULL);
int size = 0;
- if (ioctl(socket->fd, FIONREAD, &size) == -1)
+ if (TEMP_FAILURE_RETRY(ioctl(socket->fd, FIONREAD, &size)) == -1)
return -1;
return size;
}