Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2025-12-11 04:47:47 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

modlib:support modlib can load exec

Browse Source 
Signed-off-by: anjiahao <anjiahao@xiaomi.com>
This commit is contained in:
anjiahao
2024-07-16 11:31:07 +08:00
committed by Xiang Xiao
parent 9c191e93b7
commit 2931d1e85f
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libs/libc/modlib/modlib_load.c
View File

@@ -328,6 +328,11 @@ static inline int modlib_loadfile(FAR struct mod_loadinfo_s *loadinfo)
* execution
*/
if (shdr->sh_size == 0)
{
continue;
}
if ((shdr->sh_flags & SHF_ALLOC) == 0)
{
continue;
@@ -360,7 +365,7 @@ static inline int modlib_loadfile(FAR struct mod_loadinfo_s *loadinfo)
}
*pptr = (FAR uint8_t *)_ALIGN_UP((uintptr_t)*pptr,
shdr->sh_addralign);
shdr->sh_addralign);
}
/* SHT_NOBITS indicates that there is no data in the file for the
@@ -370,7 +375,7 @@ static inline int modlib_loadfile(FAR struct mod_loadinfo_s *loadinfo)
if (shdr->sh_type != SHT_NOBITS)
{
#ifdef CONFIG_MODLIB_LOADTO_LMA
ret = modlib_vma2lma(loadinfo, shdr, *pptr);
ret = modlib_vma2lma(loadinfo, shdr, (FAR Elf_Addr *)pptr);
if (ret < 0)
{
berr("ERROR: Failed to convert addr %d: %d\n", i, ret);
@@ -393,7 +398,7 @@ static inline int modlib_loadfile(FAR struct mod_loadinfo_s *loadinfo)
* section must be cleared.
*/
else
else if (*pptr != NULL)
{
memset(*pptr, 0, shdr->sh_size);
}
@@ -509,7 +514,7 @@ int modlib_load(FAR struct mod_loadinfo_s *loadinfo)
}
#endif
}
else
else if (loadinfo->ehdr.e_type == ET_DYN)
{
loadinfo->textalloc = (uintptr_t)lib_memalign(loadinfo->textalign,
loadinfo->textsize +

3
libs/libc/modlib/modlib_verify.c
View File

@@ -81,7 +81,8 @@ int modlib_verifyheader(FAR const Elf_Ehdr *ehdr)
/* Verify that this is a relocatable file */
if (ehdr->e_type != ET_REL && ehdr->e_type != ET_DYN)
if (ehdr->e_type != ET_REL && ehdr->e_type != ET_DYN &&
ehdr->e_type != ET_EXEC)
{
berr("ERROR: Not a relocatable file: e_type=%d\n", ehdr->e_type);
return -EINVAL;