p71924506
/
kernel_liteos_a
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!14 【轻量级 PR】：Fix mmap 

Merge pull request !14 from Harylee/N/A
This commit is contained in:
openharmony_ci 2020-09-28 16:42:41 +08:00 committed by Gitee
parent abfa4988e5 f62115dfef
commit e6dae81670
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
kernel/base/include/los_vm_map.h
View File

@ -240,7 +240,6 @@ STATIC INLINE BOOL LOS_IsUserAddressRange(VADDR_T vaddr, size_t len)
return (vaddr + len > vaddr) && LOS_IsUserAddress(vaddr) && (LOS_IsUserAddress(vaddr + len - 1)); return (vaddr + len > vaddr) && LOS_IsUserAddress(vaddr) && (LOS_IsUserAddress(vaddr + len - 1));
} }
STATIC INLINE BOOL LOS_IsVmallocAddress(VADDR_T vaddr) STATIC INLINE BOOL LOS_IsVmallocAddress(VADDR_T vaddr)
{ {
return ((vaddr >= VMALLOC_START) && return ((vaddr >= VMALLOC_START) &&

6
kernel/base/vm/los_vm_map.c
View File

@ -365,7 +365,7 @@ VADDR_T OsAllocRange(LosVmSpace *vmSpace, size_t len)
if (nextStart < curEnd) { if (nextStart < curEnd) {
continue; continue;
} }
if ((nextStart - curEnd) >= len) { if ((curEnd + len) <= nextStart) {
return curEnd; return curEnd;
} else { } else {
curEnd = curRegion->range.base + curRegion->range.size; curEnd = curRegion->range.base + curRegion->range.size;
@ -379,7 +379,7 @@ VADDR_T OsAllocRange(LosVmSpace *vmSpace, size_t len)
if (nextStart < curEnd) { if (nextStart < curEnd) {
continue; continue;
} }
if ((nextStart - curEnd) >= len) { if ((curEnd + len) <= nextStart) {
return curEnd; return curEnd;
} else { } else {
curEnd = curRegion->range.base + curRegion->range.size; curEnd = curRegion->range.base + curRegion->range.size;
@ -388,7 +388,7 @@ VADDR_T OsAllocRange(LosVmSpace *vmSpace, size_t len)
} }
nextStart = vmSpace->mapBase + vmSpace->mapSize; nextStart = vmSpace->mapBase + vmSpace->mapSize;
if ((nextStart - curEnd) >= len) { if ((curEnd + len) <= nextStart) {
return curEnd; return curEnd;
} }

1
kernel/extended/dynload/src/los_load_elf.c
View File

@ -983,6 +983,7 @@ STATIC VOID OsFlushAspace(ELFLoadInfo *loadInfo)
processCB->vmSpace->heapBase += OsGetRndOffset(loadInfo); processCB->vmSpace->heapBase += OsGetRndOffset(loadInfo);
processCB->vmSpace->heapNow = processCB->vmSpace->heapBase; processCB->vmSpace->heapNow = processCB->vmSpace->heapBase;
processCB->vmSpace->mapBase += OsGetRndOffset(loadInfo); processCB->vmSpace->mapBase += OsGetRndOffset(loadInfo);
processCB->vmSpace->mapSize = loadInfo->stackBase - processCB->vmSpace->mapBase;
LOS_ArchMmuContextSwitch(&OsCurrProcessGet()->vmSpace->archMmu); LOS_ArchMmuContextSwitch(&OsCurrProcessGet()->vmSpace->archMmu);
} }