openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

libion: only modify parameters on success 

Wait until a call is successful before modifying the value of pointers
passed

Change-Id: Iaeb2517c8cefeca2f60ebf610d38f264b48e59a0
This commit is contained in:
Rom Lemarchand 2014-10-27 16:42:10 -07:00
parent d1abdeac3e
commit 5cdcdce50e
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libion/ion.c
View File

@ -90,6 +90,7 @@ int ion_map(int fd, ion_user_handle_t handle, size_t length, int prot,
int flags, off_t offset, unsigned char **ptr, int *map_fd)
{
int ret;
unsigned char *tmp_ptr;
struct ion_fd_data data = {
.handle = handle,
};
@ -102,16 +103,17 @@ int ion_map(int fd, ion_user_handle_t handle, size_t length, int prot,
ret = ion_ioctl(fd, ION_IOC_MAP, &data);
if (ret < 0)
return ret;
*map_fd = data.fd;
if (*map_fd < 0) {
if (data.fd < 0) {
ALOGE("map ioctl returned negative fd\n");
return -EINVAL;
}
*ptr = mmap(NULL, length, prot, flags, *map_fd, offset);
if (*ptr == MAP_FAILED) {
tmp_ptr = mmap(NULL, length, prot, flags, data.fd, offset);
if (tmp_ptr == MAP_FAILED) {
ALOGE("mmap failed: %s\n", strerror(errno));
return -errno;
}
*map_fd = data.fd;
*ptr = tmp_ptr;
return ret;
}
@ -129,11 +131,11 @@ int ion_share(int fd, ion_user_handle_t handle, int *share_fd)
ret = ion_ioctl(fd, ION_IOC_SHARE, &data);
if (ret < 0)
return ret;
*share_fd = data.fd;
if (*share_fd < 0) {
if (data.fd < 0) {
ALOGE("share ioctl returned negative fd\n");
return -EINVAL;
}
*share_fd = data.fd;
return ret;
}