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

Merge "libcutils: abort for invalid fd" am: 76f99770d1 

am: 8a0e1c51bd

* commit '8a0e1c51bdf42bcb3f1840173c27b097d106cd60':
  libcutils: abort for invalid fd
This commit is contained in:
Mark Salyzyn 2016-02-05 18:15:14 +00:00 committed by android-build-merger
parent a2eba56f98 8a0e1c51bd
commit c47812a94f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libcutils/ashmem-dev.c
View File

@ -118,15 +118,16 @@ static int __ashmem_is_ashmem(int fd)
}
if (rdev) {
ALOGE("illegal fd=%d mode=0%o rdev=%d:%d expected 0%o %d:%d",
LOG_ALWAYS_FATAL("illegal fd=%d mode=0%o rdev=%d:%d expected 0%o %d:%d",
fd, st.st_mode, major(st.st_rdev), minor(st.st_rdev),
S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IRGRP,
major(rdev), minor(rdev));
} else {
ALOGE("illegal fd=%d mode=0%o rdev=%d:%d expected 0%o",
LOG_ALWAYS_FATAL("illegal fd=%d mode=0%o rdev=%d:%d expected 0%o",
fd, st.st_mode, major(st.st_rdev), minor(st.st_rdev),
S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IRGRP);
}
/* NOTREACHED */
errno = ENOTTY;
return -1;