Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97adf2e8 authored by Steven Moreland's avatar Steven Moreland Committed by Gerrit Code Review
Browse files

Merge "Reapply "SharedMemory: mark fdsan ownership"" into main

parents 18860769 2e2685c3

core/java/android/os/SharedMemory.java

+9 −9
Original line number Original line Diff line number Diff line
@@ -25,6 +25,8 @@ import android.system.OsConstants; 




import dalvik.system.VMRuntime;

import dalvik.system.VMRuntime;





import libcore.io.IoUtils;



import java.io.Closeable;

import java.io.Closeable;

import java.io.FileDescriptor;

import java.io.FileDescriptor;

import java.io.IOException;

import java.io.IOException;
@@ -63,7 +65,7 @@ public final class SharedMemory implements Parcelable, Closeable { 




        mMemoryRegistration = new MemoryRegistration(mSize);

        mMemoryRegistration = new MemoryRegistration(mSize);

        mCleaner = Cleaner.create(mFileDescriptor,

        mCleaner = Cleaner.create(mFileDescriptor,

                new Closer(mFileDescriptor.getInt$(), mMemoryRegistration));

                new Closer(mFileDescriptor, mMemoryRegistration));

    }

    }





    /**

    /**
@@ -276,7 +278,6 @@ public final class SharedMemory implements Parcelable, Closeable { 
     */

     */

    @Override

    @Override

    public void close() {

    public void close() {

        mFileDescriptor.setInt$(-1);

        if (mCleaner != null) {

        if (mCleaner != null) {

            mCleaner.clean();

            mCleaner.clean();

            mCleaner = null;

            mCleaner = null;
@@ -326,21 +327,20 @@ public final class SharedMemory implements Parcelable, Closeable { 
     * Cleaner that closes the FD

     * Cleaner that closes the FD

     */

     */

    private static final class Closer implements Runnable {

    private static final class Closer implements Runnable {

        private int mFd;

        private FileDescriptor mFd;

        private MemoryRegistration mMemoryReference;

        private MemoryRegistration mMemoryReference;





        private Closer(int fd, MemoryRegistration memoryReference) {

        private Closer(FileDescriptor fd, MemoryRegistration memoryReference) {

            mFd = fd;

            mFd = fd;

            IoUtils.setFdOwner(mFd, this);

            mMemoryReference = memoryReference;

            mMemoryReference = memoryReference;

        }

        }





        @Override

        @Override

        public void run() {

        public void run() {

            try {

            IoUtils.closeQuietly(mFd);

                FileDescriptor fd = new FileDescriptor();

            mFd = null;

                fd.setInt$(mFd);



                Os.close(fd);

            } catch (ErrnoException e) { /* swallow error */ }

            mMemoryReference.release();

            mMemoryReference.release();

            mMemoryReference = null;

            mMemoryReference = null;

        }

        }

core/tests/coretests/src/android/content/ContentResolverTest.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -87,7 +87,7 @@ public class ContentResolverTest { 
        bitmap.compress(Bitmap.CompressFormat.PNG, 90, mImage.getOutputStream());

        bitmap.compress(Bitmap.CompressFormat.PNG, 90, mImage.getOutputStream());





        final AssetFileDescriptor afd = new AssetFileDescriptor(

        final AssetFileDescriptor afd = new AssetFileDescriptor(

                new ParcelFileDescriptor(mImage.getFileDescriptor()), 0, mSize, null);

                ParcelFileDescriptor.dup(mImage.getFileDescriptor()), 0, mSize, null);

        when(mProvider.openTypedAssetFile(any(), any(), any(), any(), any())).thenReturn(

        when(mProvider.openTypedAssetFile(any(), any(), any(), any(), any())).thenReturn(

                afd);

                afd);

    }

    }