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

!375 基于汇编实现内核对用户态内存清零的功能

Browse Source 
Merge pull request !375 from Harylee/mem
This commit is contained in:
openharmony_ci
2021-06-29 04:41:02 +00:00
committed by Gitee
parent 43bdf2f1d3 9db3407589
commit 339c467e71
4 changed files with 157 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -416,42 +416,20 @@ INT32 OsGetKernelVaddr(const LosVmSpace *space, VADDR_T vaddr, VADDR_T *kvaddr)
STATIC INT32 OsSetBss(const LD_ELF_PHDR *elfPhdr, INT32 fd, UINTPTR bssStart, UINT32 bssEnd, UINT32 elfProt)
{
UINTPTR bssPageStart, bssStartPageAlign, bssEndPageAlign;
UINTPTR bssStartPageAlign, bssEndPageAlign;
UINTPTR mapBase;
UINT32 offset, size;
UINT32 bssMapSize;
INT32 stackFlags;
INT32 ret;
vaddr_t kvaddr = 0;
bssPageStart = ROUNDDOWN(bssStart, PAGE_SIZE);
bssStartPageAlign = ROUNDUP(bssStart, PAGE_SIZE);
bssEndPageAlign = ROUNDUP(bssEnd, PAGE_SIZE);
ret = LOS_UnMMap(bssPageStart, (bssEndPageAlign - bssPageStart));
if ((ret != LOS_OK) && (bssPageStart != 0)) {
PRINT_ERR("%s[%d], Failed to unmap a region, vaddr: %#x!\n", __FUNCTION__, __LINE__, bssPageStart);
}
ret = LOS_UserSpaceVmAlloc(OsCurrProcessGet()->vmSpace, PAGE_SIZE, (VOID **)&bssPageStart,
0, OsCvtProtFlagsToRegionFlags(elfProt, MAP_FIXED));
if (ret != LOS_OK) {
PRINT_ERR("%s[%d], Failed to do vmm alloc!\n", __FUNCTION__, __LINE__);
return -ENOMEM;
}
ret = OsGetKernelVaddr(OsCurrProcessGet()->vmSpace, bssPageStart, &kvaddr);
if (ret != LOS_OK) {
PRINT_ERR("%s[%d]\n", __FUNCTION__, __LINE__);
ret = LOS_UserMemClear((VOID *)bssStart, PAGE_SIZE - ROUNDOFFSET(bssStart, PAGE_SIZE));
if (ret != 0) {
PRINT_ERR("%s[%d], Failed to clear bss\n", __FUNCTION__, __LINE__);
return -EFAULT;
}
(VOID)memset_s((VOID *)(UINTPTR)kvaddr, PAGE_SIZE, 0, PAGE_SIZE);
offset = ROUNDDOWN(elfPhdr->offset + elfPhdr->fileSize, PAGE_SIZE);
size = ROUNDOFFSET(elfPhdr->offset + elfPhdr->fileSize, PAGE_SIZE);
ret = OsReadELFInfo(fd, (UINT8 *)(UINTPTR)kvaddr, size, offset);
if (ret != LOS_OK) {
PRINT_ERR("%s[%d]\n", __FUNCTION__, __LINE__);
return -EIO;
}
bssMapSize = bssEndPageAlign - bssStartPageAlign;
if (bssMapSize > 0) {