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

Commit 1cebd62c authored by Ytai Ben-tsvi's avatar Ytai Ben-tsvi Committed by Android (Google) Code Review
Browse files

Merge "Improve visibility of IMemory security risks"

parents a0005ba4 11107873

cas/1.0/vts/functional/VtsHalCasV1_0TargetTest.cpp

+2 −2
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ class MediaCasHidlTest : public ::testing::VtsHalHidlTargetTestBase { 
        return ::testing::AssertionFailure();

    }



    uint8_t* ipBuffer = static_cast<uint8_t*>(static_cast<void*>(mem->pointer()));

    uint8_t* ipBuffer = static_cast<uint8_t*>(static_cast<void*>(mem->unsecurePointer()));

    memcpy(ipBuffer, kInBinaryBuffer, sizeof(kInBinaryBuffer));



    // hidlMemory is not to be passed out of scope!
@@ -568,7 +568,7 @@ TEST_F(MediaCasHidlTest, TestClearKeyApis) { 
    EXPECT_EQ(Status::OK, descrambleStatus);



    ASSERT_NE(nullptr, dataMemory.get());

    uint8_t* opBuffer = static_cast<uint8_t*>(static_cast<void*>(dataMemory->pointer()));

    uint8_t* opBuffer = static_cast<uint8_t*>(static_cast<void*>(dataMemory->unsecurePointer()));



    int compareResult =

        memcmp(static_cast<const void*>(opBuffer), static_cast<const void*>(kOutRefBinaryBuffer),

cas/1.1/vts/functional/VtsHalCasV1_1TargetTest.cpp

+2 −2
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ class MediaCasHidlTest : public ::testing::VtsHalHidlTargetTestBase { 
        return ::testing::AssertionFailure();

    }



    uint8_t* ipBuffer = static_cast<uint8_t*>(static_cast<void*>(mem->pointer()));

    uint8_t* ipBuffer = static_cast<uint8_t*>(static_cast<void*>(mem->unsecurePointer()));

    memcpy(ipBuffer, kInBinaryBuffer, sizeof(kInBinaryBuffer));



    // hidlMemory is not to be passed out of scope!
@@ -543,7 +543,7 @@ TEST_F(MediaCasHidlTest, TestClearKeyApisWithSession) { 
    EXPECT_EQ(Status::OK, descrambleStatus);



    ASSERT_NE(nullptr, dataMemory.get());

    uint8_t* opBuffer = static_cast<uint8_t*>(static_cast<void*>(dataMemory->pointer()));

    uint8_t* opBuffer = static_cast<uint8_t*>(static_cast<void*>(dataMemory->unsecurePointer()));



    int compareResult =

            memcmp(static_cast<const void*>(opBuffer),