commit 27b0b3f7704acee9f2a80421ef3c98a09dd0676c
author Tri Vo <trong@google.com> Tue Nov 17 19:41:57 2020 -0800
committer Tri Vo <trong@google.com> Tue Nov 17 19:56:07 2020 -0800
tree b0c016c6eec55a362e778d50f14f876d6eb7a541
parent b47dbe7eb0640f47b3f970929515071ec0f622bb

trusty: wrap syscalls in TEMP_FAILURE_RETRY

Needed to handle EINTR robustly.

Test: m libtrusty
Change-Id: I46a58ae911fd8db3d3528e24edbb6013d807b48c

trusty/libtrusty/trusty.c

diff --git a/trusty/libtrusty/trusty.c b/trusty/libtrusty/trusty.c
index 1a440a3..f44f8b4 100644
--- a/trusty/libtrusty/trusty.c
+++ b/trusty/libtrusty/trusty.c
@@ -33,14 +33,14 @@
     int fd;
     int rc;
 
-    fd = open(dev_name, O_RDWR);
+    fd = TEMP_FAILURE_RETRY(open(dev_name, O_RDWR));
     if (fd < 0) {
         rc = -errno;
         ALOGE("%s: cannot open tipc device \"%s\": %s\n", __func__, dev_name, strerror(errno));
         return rc < 0 ? rc : -1;
     }
 
-    rc = ioctl(fd, TIPC_IOC_CONNECT, srv_name);
+    rc = TEMP_FAILURE_RETRY(ioctl(fd, TIPC_IOC_CONNECT, srv_name));
     if (rc < 0) {
         rc = -errno;
         ALOGE("%s: can't connect to tipc service \"%s\" (err=%d)\n", __func__, srv_name, errno);
@@ -60,7 +60,7 @@
     req.shm = (__u64)shms;
     req.shm_cnt = (__u64)shmcnt;
 
-    int rc = ioctl(fd, TIPC_IOC_SEND_MSG, &req);
+    int rc = TEMP_FAILURE_RETRY(ioctl(fd, TIPC_IOC_SEND_MSG, &req));
     if (rc < 0) {
         ALOGE("%s: failed to send message (err=%d)\n", __func__, rc);
     }