commit 7ae3b07c36e66ca95716c84e08de33e12fc21f6f
author John Reck <jreck@google.com> Thu Jan 30 12:55:09 2025 -0800
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Feb 03 12:33:08 2025 -0800
tree d8a15fd27edc5b11570b6af0c5536a8215b42179
parent d57664e9bc4670b3ecf6748a746a57c557b6bc9e

Revert "Reapply "SharedMemory: mark fdsan ownership""

This reverts commit 2e2685c3da1b81867e6cf3137f84dd02fb0a9ab6.

Reason for revert: The reapplication reintroduces a memory leak
Bug: 393198065
Test: atest SharedMemoryFileDescriptorTest
(cherry picked from https://android-review.googlesource.com/q/commit:5ada3c5629d43e38ba6d2adf89cf69a94d5e0b69)
Merged-In: I5d410f05b061a41e089fa652e5565224a3488baf
Change-Id: I5d410f05b061a41e089fa652e5565224a3488baf

core/java/android/os/SharedMemory.java

diff --git a/core/java/android/os/SharedMemory.java b/core/java/android/os/SharedMemory.java
index 46ae9d8..320641d 100644
--- a/core/java/android/os/SharedMemory.java
+++ b/core/java/android/os/SharedMemory.java
@@ -25,8 +25,6 @@
 
 import dalvik.system.VMRuntime;
 
-import libcore.io.IoUtils;
-
 import java.io.Closeable;
 import java.io.FileDescriptor;
 import java.io.IOException;
@@ -65,7 +63,7 @@
 
         mMemoryRegistration = new MemoryRegistration(mSize);
         mCleaner = Cleaner.create(mFileDescriptor,
-                new Closer(mFileDescriptor, mMemoryRegistration));
+                new Closer(mFileDescriptor.getInt$(), mMemoryRegistration));
     }
 
     /**
@@ -278,6 +276,7 @@
      */
     @Override
     public void close() {
+        mFileDescriptor.setInt$(-1);
         if (mCleaner != null) {
             mCleaner.clean();
             mCleaner = null;
@@ -327,20 +326,21 @@
      * Cleaner that closes the FD
      */
     private static final class Closer implements Runnable {
-        private FileDescriptor mFd;
+        private int mFd;
         private MemoryRegistration mMemoryReference;
 
-        private Closer(FileDescriptor fd, MemoryRegistration memoryReference) {
+        private Closer(int fd, MemoryRegistration memoryReference) {
             mFd = fd;
-            IoUtils.setFdOwner(mFd, this);
             mMemoryReference = memoryReference;
         }
 
         @Override
         public void run() {
-            IoUtils.closeQuietly(mFd);
-            mFd = null;
-
+            try {
+                FileDescriptor fd = new FileDescriptor();
+                fd.setInt$(mFd);
+                Os.close(fd);
+            } catch (ErrnoException e) { /* swallow error */ }
             mMemoryReference.release();
             mMemoryReference = null;
         }