ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Parcel: extra validation/debug code for writeDupFileDescriptor" into lmp-dev

Browse Source
This commit is contained in:
Jesse Hall 2014-10-06 22:36:53 +00:00 committed by Android (Google) Code Review
commit 78639c22ac
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libs/binder/Parcel.cpp
View File

@ -26,6 +26,7 @@
#include <binder/TextOutput.h> #include <binder/TextOutput.h>
#include <errno.h> #include <errno.h>
#include <utils/CallStack.h>
#include <utils/Debug.h> #include <utils/Debug.h>
#include <utils/Log.h> #include <utils/Log.h>
#include <utils/String8.h> #include <utils/String8.h>
@ -767,6 +768,29 @@ status_t Parcel::writeFileDescriptor(int fd, bool takeOwnership)
status_t Parcel::writeDupFileDescriptor(int fd) status_t Parcel::writeDupFileDescriptor(int fd)
{ {
int dupFd = dup(fd); int dupFd = dup(fd);
{ // Temporary extra debug validation for b/17477219: a Parcel recipient is
// getting a positive but invalid fd unexpectedly. Trying to track down
// where it's coming from.
int dupErrno = dupFd < 0 ? errno : 0;
int fdFlags = fcntl(fd, F_GETFD);
int fdFlagsErrno = fdFlags == -1 ? errno : 0;
int dupFlags = fcntl(dupFd, F_GETFD);
int dupFlagsErrno = dupFlags == -1 ? errno : 0;
if (dupFd < 0 || fdFlags == -1 || dupFlags == -1) {
ALOGE("Parcel::writeDupFileDescriptor failed:\n"
" fd=%d flags=%d err=%d(%s)\n"
" dupFd=%d dupErr=%d(%s) flags=%d err=%d(%s)",
fd, fdFlags, fdFlagsErrno, strerror(fdFlagsErrno),
dupFd, dupErrno, strerror(dupErrno),
dupFlags, dupFlagsErrno, strerror(dupFlagsErrno));
if (fd < 0 || fdFlags == -1) {
CallStack(LOG_TAG);
}
return -errno;
}
}
if (dupFd < 0) { if (dupFd < 0) {
return -errno; return -errno;
} }
@ -1297,6 +1321,7 @@ status_t Parcel::read(FlattenableHelperInterface& val) const
oldfd, fds[i], dupErrno, strerror(dupErrno), oldfd, fds[i], dupErrno, strerror(dupErrno),
oldfd, flags, fcntlErrno, strerror(fcntlErrno), oldfd, flags, fcntlErrno, strerror(fcntlErrno),
flat, flat ? flat->type : 0); flat, flat ? flat->type : 0);
CallStack(LOG_TAG);
} }
} }