RT-Thread/rt-thread
1
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2025-10-20 05:25:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

[mm] distinguish NULL and MAP_FAILED

Browse Source
This commit is contained in:
wangxiaoyao
2023-02-20 13:44:20 +08:00
committed by guo
parent ed58f6676d
commit 855aef9c9c
6 changed files with 42 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/lwp/lwp_shm.c
View File

@@ -262,7 +262,7 @@ static void *_lwp_shmat(int id, void *shm_vaddr)
struct rt_lwp *lwp = RT_NULL;
struct lwp_avl_struct *node_key = RT_NULL;
struct lwp_shm_struct *p = RT_NULL;
void *va = RT_NULL;
void *va = shm_vaddr;
/* The id is used to locate the node_key in the binary tree, and then get the
* shared-memory structure linked to the node_key. We don't use the id to refer
@@ -282,16 +282,12 @@ static void *_lwp_shmat(int id, void *shm_vaddr)
{
return RT_NULL;
}
if (shm_vaddr == 0)
va = ARCH_MAP_FAILED;
else
va = shm_vaddr;
err = rt_aspace_map(lwp->aspace, &va, p->size, MMU_MAP_U_RWCB, MMF_PREFETCH,
&p->mem_obj, 0);
if (err != RT_EOK)
{
va = 0;
va = RT_NULL;
}
return va;
}