Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 04:41:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1901996: apply code formatting via Lando

Browse Source 
# ignore-this-changeset
This commit is contained in:
Otto Länd 2024-10-29 03:24:23 +00:00
parent c8f1c7016f
commit 1235dca15f
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ipc/glue/SharedMemory_posix.cpp
View File

@ -177,19 +177,18 @@ static Maybe<unsigned> HaveMemfd() {
#ifdef USE_MEMFD_CREATE #ifdef USE_MEMFD_CREATE
static const Maybe<unsigned> kHave = []() -> Maybe<unsigned> { static const Maybe<unsigned> kHave = []() -> Maybe<unsigned> {
unsigned flags = MFD_CLOEXEC | MFD_ALLOW_SEALING; unsigned flags = MFD_CLOEXEC | MFD_ALLOW_SEALING;
#ifdef MFD_NOEXEC_SEAL # ifdef MFD_NOEXEC_SEAL
flags |= MFD_NOEXEC_SEAL; flags |= MFD_NOEXEC_SEAL;
#endif # endif
mozilla::UniqueFileHandle fd( mozilla::UniqueFileHandle fd(memfd_create("mozilla-ipc-test", flags));
memfd_create("mozilla-ipc-test", flags));
#ifdef MFD_NOEXEC_SEAL # ifdef MFD_NOEXEC_SEAL
if (!fd && errno == EINVAL) { if (!fd && errno == EINVAL) {
flags &= ~MFD_NOEXEC_SEAL; flags &= ~MFD_NOEXEC_SEAL;
fd.reset(memfd_create("mozilla-ipc-test", flags)); fd.reset(memfd_create("mozilla-ipc-test", flags));
} }
#endif # endif
if (!fd) { if (!fd) {
DCHECK_EQ(errno, ENOSYS); DCHECK_EQ(errno, ENOSYS);

15
ipc/gtest/TestSharedMemory.cpp
View File

@ -298,6 +298,7 @@ TEST(IPCSharedMemory, BasicIsZero)
class IPCSharedMemoryLinuxTest : public ::testing::Test { class IPCSharedMemoryLinuxTest : public ::testing::Test {
int mMajor = 0; int mMajor = 0;
int mMinor = 0; int mMinor = 0;
protected: protected:
void SetUp() override { void SetUp() override {
if (mMajor != 0) { if (mMajor != 0) {
@ -313,21 +314,16 @@ class IPCSharedMemoryLinuxTest : public ::testing::Test {
return mMajor > aMajor || (mMajor == aMajor && mMinor >= aMinor); return mMajor > aMajor || (mMajor == aMajor && mMinor >= aMinor);
} }
bool ShouldHaveMemfd() { bool ShouldHaveMemfd() { return HaveKernelVersion(3, 17); }
return HaveKernelVersion(3, 17);
}
bool ShouldHaveMemfdNoExec() { bool ShouldHaveMemfdNoExec() { return HaveKernelVersion(6, 3); }
return HaveKernelVersion(6, 3);
}
}; };
// Test that memfd_create is used where expected. // Test that memfd_create is used where expected.
// //
// More precisely: if memfd_create support is expected, verify that // More precisely: if memfd_create support is expected, verify that
// shared memory isn't subject to a filesystem size limit. // shared memory isn't subject to a filesystem size limit.
TEST_F(IPCSharedMemoryLinuxTest, IsMemfd) TEST_F(IPCSharedMemoryLinuxTest, IsMemfd) {
{
auto shm = MakeRefPtr<ipc::SharedMemory>(); auto shm = MakeRefPtr<ipc::SharedMemory>();
ASSERT_TRUE(shm->Create(1)); ASSERT_TRUE(shm->Create(1));
UniqueFileHandle fd = shm->TakeHandleAndUnmap(); UniqueFileHandle fd = shm->TakeHandleAndUnmap();
@ -347,8 +343,7 @@ TEST_F(IPCSharedMemoryLinuxTest, IsMemfd)
} }
} }
TEST_F(IPCSharedMemoryLinuxTest, MemfdNoExec) TEST_F(IPCSharedMemoryLinuxTest, MemfdNoExec) {
{
const bool expectExec = ShouldHaveMemfd() && !ShouldHaveMemfdNoExec(); const bool expectExec = ShouldHaveMemfd() && !ShouldHaveMemfdNoExec();
auto shm = MakeRefPtr<ipc::SharedMemory>(); auto shm = MakeRefPtr<ipc::SharedMemory>();