tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

trusty: wrap syscalls in TEMP_FAILURE_RETRY

Browse source 
Needed to handle EINTR robustly.

Test: m libtrusty
Change-Id: I46a58ae911fd8db3d3528e24edbb6013d807b48c
This commit is contained in:
Tri Vo 2020-11-17 19:41:57 -08:00
parent b47dbe7eb0
commit 27b0b3f770
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
trusty/libtrusty/trusty.c
View file

@ -33,14 +33,14 @@ int tipc_connect(const char* dev_name, const char* srv_name) {
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 @@ ssize_t tipc_send(int fd, const struct iovec* iov, int iovcnt, struct trusty_shm
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);
}