Skip to content

llext: check number of module entries in libraries #10924

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
lyakh wants to merge 2 commits into
base: main
Choose a base branch
from
Open

llext: check number of module entries in libraries #10924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a63d283
lib-manager: check total claimed library size when loading
lyakh Jun 18, 2026
941a438
llext: check number of module entries in libraries
lyakh Jun 16, 2026
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
16 changes: 12 additions & 4 deletions src/library_manager/lib_manager.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -949,9 +949,17 @@ static int lib_manager_store_library(struct lib_manager_dma_ext *dma_ext,
void __sparse_cache *library_base_address;
const struct sof_man_fw_desc *man_desc = (struct sof_man_fw_desc *)
((__sparse_force uint8_t *)man_buffer + SOF_MAN_ELF_TEXT_OFFSET);
uint32_t preload_size = man_desc->header.preload_page_count * PAGE_SZ;
int ret;

/* Zephyr UINT_MAX is explicitly 32 bits, and so is preload_page_count */
if (man_desc->header.preload_page_count >= UINT_MAX / PAGE_SZ) {
tr_err(&lib_manager_tr, "Invalid preload page count %u.",
man_desc->header.preload_page_count);
return -EINVAL;
}

uint32_t preload_size = man_desc->header.preload_page_count * PAGE_SZ;

/*
* The module manifest structure always has its maximum size regardless of
* the actual size of the manifest.
Expand All @@ -961,10 +969,10 @@ static int lib_manager_store_library(struct lib_manager_dma_ext *dma_ext,
return -EINVAL;
}

/* Prepare storage memory, note: it is never freed, library unloading is unsupported */
/*
* Prepare storage memory, note: it is never freed, it is assumed, that this
* memory is abundant, so we store all loaded modules there permanently
* Prepare storage memory, note: it is never freed, it is assumed, that
* this memory is abundant, so we store all loaded modules there
* permanently, unloading is unsupported
*/
library_base_address = lib_manager_allocate_store_mem(preload_size, 0);
if (!library_base_address)
Expand Down
26 changes: 22 additions & 4 deletions src/library_manager/llext_manager.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#include <zephyr/llext/llext.h>
#include <zephyr/logging/log_ctrl.h>
#include <zephyr/llext/inspect.h>
#include <zephyr/sys/math_extras.h>
#include <kernel_arch_interface.h>

#include <rimage/sof/user/manifest.h>
Expand Down Expand Up @@ -457,9 +458,22 @@ static int llext_manager_mod_init(struct lib_manager_mod_ctx *ctx,
{
struct sof_man_module *mod_array = (struct sof_man_module *)((uint8_t *)desc +
SOF_MAN_MODULE_OFFSET(0));
/* preload_page_count was checked when library was loaded */
size_t lib_size = desc->header.preload_page_count * PAGE_SZ;
unsigned int i, n_mod;
size_t offs;

/* We'll check overflows below */
uintptr_t mod_end_addr = (uintptr_t)(mod_array + desc->header.num_module_entries);
uintptr_t img_end_addr = (uintptr_t)desc - SOF_MAN_ELF_TEXT_OFFSET + lib_size;

if (mod_end_addr < (uintptr_t)mod_array || img_end_addr < (uintptr_t)desc ||
mod_end_addr >= img_end_addr) {
tr_err(&lib_manager_tr, "invalid module entry count: %u",
desc->header.num_module_entries);
return -EOVERFLOW;
}

/* count modules */
for (i = 0, n_mod = 0, offs = ~0; i < desc->header.num_module_entries; i++)
if (mod_array[i].segment[LIB_MANAGER_TEXT].file_offset != offs) {
Expand Down Expand Up @@ -1055,19 +1069,23 @@ int llext_manager_add_library(uint32_t module_id)

const struct sof_man_fw_desc *desc = lib_manager_get_library_manifest(module_id);
unsigned int i;
int ret;

if (!ctx->mod)
llext_manager_mod_init(ctx, desc);
if (!ctx->mod) {
ret = llext_manager_mod_init(ctx, desc);
if (ret < 0)
return ret;
}

for (i = 0; i < ctx->n_mod; i++) {
const struct sof_man_module *mod = lib_manager_get_module_manifest(module_id + i);

if (mod->type.load_type == SOF_MAN_MOD_TYPE_LLEXT_AUX) {
const struct sof_man_module_manifest *mod_manifest;
Comment thread
lyakh marked this conversation as resolved.
const struct sof_module_api_build_info *buildinfo;
int ret = llext_manager_link_single(module_id + i, desc, ctx,
(const void **)&buildinfo, &mod_manifest);

ret = llext_manager_link_single(module_id + i, desc, ctx,
(const void **)&buildinfo, &mod_manifest);
if (ret < 0)
return ret;
}
Expand Down
Loading