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

Commit 4ceda96d authored by Sungtak Lee's avatar Sungtak Lee Committed by Automerger Merge Worker
Browse files

C2SurfaceSyncObj: prevent OOB read in Import am: 7470a6a1 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/20758529



Change-Id: I98083aa799cc94cb64ec50f334c8da327dc6ef7b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b51c0875 7470a6a1

media/codec2/vndk/platform/C2SurfaceSyncObj.cpp

+5 −0
Original line number Diff line number Diff line
@@ -64,6 +64,11 @@ std::shared_ptr<C2SurfaceSyncMemory> C2SurfaceSyncMemory::Import( 
    }



    HandleSyncMem *o = static_cast<HandleSyncMem*>(handle);

    if (o->size() < sizeof(C2SyncVariables)) {

        android_errorWriteLog(0x534e4554, "240140929");

        return nullptr;

    }



    void *ptr = mmap(NULL, o->size(), PROT_READ | PROT_WRITE, MAP_SHARED, o->memFd(), 0);



    if (ptr == MAP_FAILED) {