qiurui
/
asterinas
mirror of https://github.com/asterinas/asterinas.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 750187cc72 into 5f8b019369

This commit is contained in:
Yuwei LIU 2026-02-10 14:45:26 +08:00 committed by GitHub
parent 5f8b019369 750187cc72
commit 7365dc5030
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kernel/src/vm/vmar/vmar_impls/protect.rs
View File

@ -43,7 +43,12 @@ impl Vmar {
let new_perms = perms | (vm_mapping_perms & VmPerms::ALL_MAY_PERMS);
new_perms.check()?;
let vm_mapping = inner.remove(&vm_mapping_range.start).unwrap();
let Some(vm_mapping) = inner.remove(&vm_mapping_range.start) else {
// This can happen only if the mapping is merged to the previous one (just
// protected before). We can skip this mapping because its property is already
// correct.
continue;
};
let vm_mapping_range = vm_mapping.range();
let intersected_range = get_intersected_range(&range, &vm_mapping_range);

14
test/initramfs/src/apps/mmap/mmap_and_mprotect.c
View File

@ -69,3 +69,17 @@ FN_TEST(mprotect_invalid_permission)
TEST_SUCC(munmap(addr, PAGE_SIZE));
}
END_TEST()
FN_TEST(mprotect_merge_after_split_mapping)
{
void *addr = TEST_SUCC(mmap(NULL, 2 * PAGE_SIZE, PROT_READ | PROT_WRITE,
MAP_PRIVATE | MAP_ANONYMOUS, -1, 0));
// Split the mapping into two.
TEST_SUCC(mprotect(addr, PAGE_SIZE, PROT_READ));
// After the first mapping is protected, the two mappings will merge.
TEST_SUCC(mprotect(addr, 2 * PAGE_SIZE, PROT_READ | PROT_WRITE));
TEST_SUCC(munmap(addr, 2 * PAGE_SIZE));
}
END_TEST()