SharedMemory: clear file descriptor when explicitly closed.

We run the Cleaner in close, but after the fix in commit 6ca916a6, this
no longer clears the value stored in the FileDescriptor, which means
that subsequent operations on an explicitly closed SharedMemory will
operate on a bogus fd number. Clearing the FileDescriptor value in close
is sufficient, because Cleaner.clean is idempotent, and the only other
case where it executes is when the FileDescriptor is phantom reachable,
which means no one can access it to get its integer value.

Bug: http://b/138392115
Bug: http://b/138323667
Test: treehugger
Change-Id: I8bdb4c745466532a0712976416184c53fcf0dbf6
(cherry picked from commit a7641806dd)
(cherry picked from commit 20ab1e3427)
This commit is contained in:
Josh Gao
2019-07-25 13:54:23 -07:00
committed by android-build-team Robot
parent bc999ddb2d
commit 475ca92491

View File

@@ -259,6 +259,9 @@ public final class SharedMemory implements Parcelable, Closeable {
mCleaner.clean();
mCleaner = null;
}
// Cleaner.clean doesn't clear the value of the file descriptor.
mFileDescriptor.setInt$(-1);
}
@Override