Skip to content

llext: userspace: clear cold segment descriptors when sections are ab… #11159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kv2019i wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −0
Open

llext: userspace: clear cold segment descriptors when sections are ab… #11159

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/library_manager/llext_manager.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -955,6 +955,16 @@ static int llext_manager_add_mod_domain(struct lib_manager_module *mctx, struct
goto e_data;
mctx->segment[LIB_MANAGER_COLD].addr = (uintptr_t)text_addr + text_offset;
mctx->segment[LIB_MANAGER_COLD].size = shdr_cold.sh_size;
} else {
/*
* No .cold section: make sure the descriptor is empty so that
* llext_manager_rm_mod_domain() doesn't later try to remove a
* partition that was never added. The module context is
* allocated with rmalloc() and these fields are otherwise left
* uninitialised.
*/
mctx->segment[LIB_MANAGER_COLD].addr = 0;
mctx->segment[LIB_MANAGER_COLD].size = 0;
}

if (rodata) {
Expand All @@ -967,6 +977,10 @@ static int llext_manager_add_mod_domain(struct lib_manager_module *mctx, struct
goto e_cold;
mctx->segment[LIB_MANAGER_COLDRODATA].addr = (uintptr_t)rodata_addr + rodata_offset;
mctx->segment[LIB_MANAGER_COLDRODATA].size = shdr_coldrodata.sh_size;
} else {
/* No .coldrodata section, see the comment above */
mctx->segment[LIB_MANAGER_COLDRODATA].addr = 0;
mctx->segment[LIB_MANAGER_COLDRODATA].size = 0;
}

return 0;
Expand Down
Loading