From 4a9531d3263c5ea32501d3a1417373d465d04aac Mon Sep 17 00:00:00 2001 From: Greg Hackmann Date: Tue, 11 Apr 2017 15:08:36 -0700 Subject: [PATCH] AshmemTest: expand ProtTest cases ashmem buffers start with PROT_EXEC | PROT_READ | PROT_WRITE and can have bits individually removed (but not added) through the ASHMEM_SET_PROT_MASK ioctl. Test that removing prot bits more than once works, and that the kernel blocks adding prot bits. Also test that the complementary ASHMEM_GET_PROT_MASK ioctl returns the expected prot mask. Test: /data/nativetest64/libcutils_test/libcutils_test64 \ --gtest_filter=AshmemTest.* (on hikey) Test: /data/nativetest/libcutils_test/libcutils_test32 \ --gtest_filter=AshmemTest.* (on hikey) Change-Id: If7b13672547ec4cf6dfd1886197f40f12b2f1c85 Signed-off-by: Greg Hackmann --- libcutils/tests/AshmemTest.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/libcutils/tests/AshmemTest.cpp b/libcutils/tests/AshmemTest.cpp index 5493b2cd1..a87e23e30 100644 --- a/libcutils/tests/AshmemTest.cpp +++ b/libcutils/tests/AshmemTest.cpp @@ -39,6 +39,10 @@ void TestProtDenied(const unique_fd &fd, size_t size, int prot) { EXPECT_EQ(MAP_FAILED, mmap(nullptr, size, prot, MAP_SHARED, fd, 0)); } +void TestProtIs(const unique_fd& fd, int prot) { + EXPECT_EQ(prot, ioctl(fd, ASHMEM_GET_PROT_MASK)); +} + void FillData(uint8_t* data, size_t dataLen) { for (size_t i = 0; i < dataLen; i++) { data[i] = i & 0xFF; @@ -166,13 +170,25 @@ TEST(AshmemTest, ProtTest) { ASSERT_NO_FATAL_FAILURE(TestCreateRegion(size, fd, PROT_READ)); TestProtDenied(fd, size, PROT_WRITE); + TestProtIs(fd, PROT_READ); ASSERT_NO_FATAL_FAILURE(TestMmap(fd, size, PROT_READ, ®ion)); EXPECT_EQ(0, munmap(region, size)); ASSERT_NO_FATAL_FAILURE(TestCreateRegion(size, fd, PROT_WRITE)); TestProtDenied(fd, size, PROT_READ); + TestProtIs(fd, PROT_WRITE); ASSERT_NO_FATAL_FAILURE(TestMmap(fd, size, PROT_WRITE, ®ion)); EXPECT_EQ(0, munmap(region, size)); + + ASSERT_NO_FATAL_FAILURE(TestCreateRegion(size, fd, PROT_READ | PROT_WRITE)); + TestProtIs(fd, PROT_READ | PROT_WRITE); + ASSERT_EQ(0, ashmem_set_prot_region(fd, PROT_READ)); + errno = 0; + ASSERT_EQ(-1, ashmem_set_prot_region(fd, PROT_READ | PROT_WRITE)) + << "kernel shouldn't allow adding protection bits"; + EXPECT_EQ(EINVAL, errno); + TestProtIs(fd, PROT_READ); + TestProtDenied(fd, size, PROT_WRITE); } TEST(AshmemTest, ForkProtTest) {