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

Merge changes I46a58ae9,I5eb8413e

Browse source 
* changes:
  trusty: wrap syscalls in TEMP_FAILURE_RETRY
  trusty: Reformat libtrusty
This commit is contained in:
Tri Vo 2020-11-18 20:02:36 +00:00 committed by Gerrit Code Review
commit 3434e29e1c
1 changed files with 21 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
trusty/libtrusty/trusty.c
View file

@ -29,30 +29,27 @@
#include <trusty/ipc.h>
int tipc_connect(const char *dev_name, const char *srv_name)
{
int fd;
int rc;
int tipc_connect(const char* dev_name, const char* srv_name) {
int fd;
int rc;
fd = 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;
}
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);
if (rc < 0) {
rc = -errno;
ALOGE("%s: can't connect to tipc service \"%s\" (err=%d)\n",
__func__, srv_name, errno);
close(fd);
return rc < 0 ? rc : -1;
}
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);
close(fd);
return rc < 0 ? rc : -1;
}
ALOGV("%s: connected to \"%s\" fd %d\n", __func__, srv_name, fd);
return fd;
ALOGV("%s: connected to \"%s\" fd %d\n", __func__, srv_name, fd);
return fd;
}
ssize_t tipc_send(int fd, const struct iovec* iov, int iovcnt, struct trusty_shm* shms,
@ -63,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);
}
@ -71,7 +68,6 @@ ssize_t tipc_send(int fd, const struct iovec* iov, int iovcnt, struct trusty_shm
return rc;
}
void tipc_close(int fd)
{
close(fd);
void tipc_close(int fd) {
close(fd);
}