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

Commit f2c1d9d2 authored by Keith Mok's avatar Keith Mok
Browse files

File size seal for memory mapped region 

When using memfd for cross process communication, we always need to seal
the file size, otherwise remote process and shrink the size we memory
mapped and thus crash the originate process causing a DoS

Bug: 294609150
Test: Build
Ignore-AOSP-First: security
Change-Id: Ibc263c4f78df897e884378e3d984a188ca8772c7
Merged-In: Ibc263c4f78df897e884378e3d984a188ca8772c7
(cherry picked from commit 3d9f1e3b)
parent ea256bec

libs/binder/MemoryHeapBase.cpp

+2 −2
Original line number Diff line number Diff line
@@ -73,8 +73,8 @@ MemoryHeapBase::MemoryHeapBase(size_t size, uint32_t flags, char const * name) 
        ALOGV("MemoryHeapBase: Attempting to force MemFD");

        fd = memfd_create_region(name ? name : "MemoryHeapBase", size);

        if (fd < 0 || (mapfd(fd, true, size) != NO_ERROR)) return;

        const int SEAL_FLAGS = ((mFlags & READ_ONLY) ? F_SEAL_FUTURE_WRITE : 0) |

                ((mFlags & MEMFD_ALLOW_SEALING) ? 0 : F_SEAL_SEAL);

        const int SEAL_FLAGS = ((mFlags & READ_ONLY) ? F_SEAL_FUTURE_WRITE : 0) | F_SEAL_GROW |

                F_SEAL_SHRINK | ((mFlags & MEMFD_ALLOW_SEALING) ? 0 : F_SEAL_SEAL);

        if (SEAL_FLAGS && (fcntl(fd, F_ADD_SEALS, SEAL_FLAGS) == -1)) {

            ALOGE("MemoryHeapBase: MemFD %s sealing with flags %x failed with error  %s", name,

                  SEAL_FLAGS, strerror(errno));

libs/binder/tests/binderMemoryHeapBaseUnitTest.cpp

+9 −4
Original line number Diff line number Diff line
@@ -35,7 +35,8 @@ TEST(MemoryHeapBase, MemfdSealed) { 
                                          "Test mapping");

    int fd = mHeap->getHeapID();

    EXPECT_NE(fd, -1);

    EXPECT_EQ(fcntl(fd, F_GET_SEALS), F_SEAL_SEAL);

    EXPECT_EQ(fcntl(fd, F_GET_SEALS), F_SEAL_GROW | F_SEAL_SHRINK | F_SEAL_SEAL);

    EXPECT_EQ(ftruncate(fd, 4096), -1);

}



TEST(MemoryHeapBase, MemfdUnsealed) {
@@ -45,7 +46,8 @@ TEST(MemoryHeapBase, MemfdUnsealed) { 
                                          "Test mapping");

    int fd = mHeap->getHeapID();

    EXPECT_NE(fd, -1);

    EXPECT_EQ(fcntl(fd, F_GET_SEALS), 0);

    EXPECT_EQ(fcntl(fd, F_GET_SEALS), F_SEAL_GROW | F_SEAL_SHRINK);

    EXPECT_EQ(ftruncate(fd, 4096), -1);

}



TEST(MemoryHeapBase, MemfdSealedProtected) {
@@ -55,7 +57,9 @@ TEST(MemoryHeapBase, MemfdSealedProtected) { 
                                          "Test mapping");

    int fd = mHeap->getHeapID();

    EXPECT_NE(fd, -1);

    EXPECT_EQ(fcntl(fd, F_GET_SEALS), F_SEAL_SEAL | F_SEAL_FUTURE_WRITE);

    EXPECT_EQ(fcntl(fd, F_GET_SEALS),

              F_SEAL_GROW | F_SEAL_SHRINK | F_SEAL_SEAL | F_SEAL_FUTURE_WRITE);

    EXPECT_EQ(ftruncate(fd, 4096), -1);

}



TEST(MemoryHeapBase, MemfdUnsealedProtected) {
@@ -66,7 +70,8 @@ TEST(MemoryHeapBase, MemfdUnsealedProtected) { 
                                          "Test mapping");

    int fd = mHeap->getHeapID();

    EXPECT_NE(fd, -1);

    EXPECT_EQ(fcntl(fd, F_GET_SEALS), F_SEAL_FUTURE_WRITE);

    EXPECT_EQ(fcntl(fd, F_GET_SEALS), F_SEAL_GROW | F_SEAL_SHRINK | F_SEAL_FUTURE_WRITE);

    EXPECT_EQ(ftruncate(fd, 4096), -1);

}



#else