yystopf
/
openharmony_kernel_liteos_a
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!496 修复mprotect修改地址区间的权限后，相应的区间名丢失问题 

Merge pull request !496 from Harylee/mem
This commit is contained in:
openharmony_ci 2021-08-10 00:05:02 +00:00 committed by Gitee
parent 5edd78e756 e425187d17
commit 007c75eb18
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
kernel/base/vm/los_vm_syscall.c
View File

@ -257,7 +257,28 @@ REGION_ALLOC_FAILED:
return ret; return ret;
} }
int LOS_DoMprotect(VADDR_T vaddr, size_t len, unsigned long prot) STATIC UINT32 OsInheritOldRegionName(UINT32 oldRegionFlags)
{
UINT32 vmFlags = 0;
if (oldRegionFlags & VM_MAP_REGION_FLAG_HEAP) {
vmFlags |= VM_MAP_REGION_FLAG_HEAP;
} else if (oldRegionFlags & VM_MAP_REGION_FLAG_STACK) {
vmFlags |= VM_MAP_REGION_FLAG_STACK;
} else if (oldRegionFlags & VM_MAP_REGION_FLAG_TEXT) {
vmFlags |= VM_MAP_REGION_FLAG_TEXT;
} else if (oldRegionFlags & VM_MAP_REGION_FLAG_VDSO) {
vmFlags |= VM_MAP_REGION_FLAG_VDSO;
} else if (oldRegionFlags & VM_MAP_REGION_FLAG_MMAP) {
vmFlags |= VM_MAP_REGION_FLAG_MMAP;
} else if (oldRegionFlags & VM_MAP_REGION_FLAG_SHM) {
vmFlags |= VM_MAP_REGION_FLAG_SHM;
}
return vmFlags;
}
INT32 LOS_DoMprotect(VADDR_T vaddr, size_t len, unsigned long prot)
{ {
LosVmSpace *space = OsCurrProcessGet()->vmSpace; LosVmSpace *space = OsCurrProcessGet()->vmSpace;
LosVmMapRegion *region = NULL; LosVmMapRegion *region = NULL;
@ -291,7 +312,7 @@ int LOS_DoMprotect(VADDR_T vaddr, size_t len, unsigned long prot)
len = LOS_Align(len, PAGE_SIZE); len = LOS_Align(len, PAGE_SIZE);
/* can't operation cross region */ /* can't operation cross region */
if (region->range.base + region->range.size < vaddr + len) { if ((region->range.base + region->range.size) < (vaddr + len)) {
ret = -EINVAL; ret = -EINVAL;
goto OUT_MPROTECT; goto OUT_MPROTECT;
} }
@ -303,6 +324,7 @@ int LOS_DoMprotect(VADDR_T vaddr, size_t len, unsigned long prot)
vmFlags = OsCvtProtFlagsToRegionFlags(prot, 0); vmFlags = OsCvtProtFlagsToRegionFlags(prot, 0);
vmFlags |= (region->regionFlags & VM_MAP_REGION_FLAG_SHARED) ? VM_MAP_REGION_FLAG_SHARED : 0; vmFlags |= (region->regionFlags & VM_MAP_REGION_FLAG_SHARED) ? VM_MAP_REGION_FLAG_SHARED : 0;
vmFlags |= OsInheritOldRegionName(region->regionFlags);
region = LOS_RegionFind(space, vaddr); region = LOS_RegionFind(space, vaddr);
if (region == NULL) { if (region == NULL) {
ret = -ENOMEM; ret = -ENOMEM;