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

Commit 6b0b0634 authored by John Eckerdal's avatar John Eckerdal Committed by Amith Yamasani
Browse files

Fixed file descriptor leak in IMemory 

Include dup in critical section to avoid multiple dup calls from
different threads.
The leak happens more frequently since patch in frameworks/av -
6773d4777f4ccbbe6377e4ae1b42c117066ae6ba when recording video since it
will access IMemory from CameraUtils::isNativeHandleMetadata

Bug: 28924660
Author: Henrik Antonsson <henrik.antonsson@sonymobile.com>
Change-Id: I769a914c3adc505b522659a0c43719fb2922e6fd
parent 6d98bac4

libs/binder/IMemory.cpp

+9 −9
Original line number Diff line number Diff line
@@ -312,6 +312,8 @@ void BpMemoryHeap::assertReallyMapped() const 
                IInterface::asBinder(this).get(),

                parcel_fd, size, err, strerror(-err));



        Mutex::Autolock _l(mLock);

        if (mHeapId == -1) {

            int fd = dup( parcel_fd );

            ALOGE_IF(fd==-1, "cannot dup fd=%d, size=%zd, err=%d (%s)",

                    parcel_fd, size, err, strerror(errno));
@@ -321,8 +323,6 @@ void BpMemoryHeap::assertReallyMapped() const 
                access |= PROT_WRITE;

            }



        Mutex::Autolock _l(mLock);

        if (mHeapId == -1) {

            mRealHeap = true;

            mBase = mmap(0, size, access, MAP_SHARED, fd, offset);

            if (mBase == MAP_FAILED) {