ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "libcutils: abort for invalid fd"

Browse source 
am: 76f99770d1

* commit '76f99770d12aedab21a9c2ecee82e5874db50bd1':
  libcutils: abort for invalid fd
This commit is contained in:
Mark Salyzyn 2016-02-05 18:12:07 +00:00 • committed by android-build-merger
commit 8a0e1c51bd
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) { 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), 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, S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IRGRP,
major(rdev), minor(rdev)); major(rdev), minor(rdev));
} else { } 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), 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); S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IRGRP);
} }
/* NOTREACHED */
errno = ENOTTY; errno = ENOTTY;
return -1; return -1;