From 2150489fbedefa70c08d99d5f56400dfcbffab97 Mon Sep 17 00:00:00 2001
From: Adrian Warecki <adrian.warecki@intel.com>
Date: Wed, 28 Feb 2024 15:23:08 +0100
Subject: [PATCH 1/7] lib_manager: Add const to library manifest variable

Added a const modifier to the module manifest variable in the
lib_manager_store_library function to prevent it from being accidentally
modified.

Signed-off-by: Adrian Warecki <adrian.warecki@intel.com>
---
 src/library_manager/lib_manager.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/library_manager/lib_manager.c b/src/library_manager/lib_manager.c
index d30253554482..7cc35c2f91b1 100644
--- a/src/library_manager/lib_manager.c
+++ b/src/library_manager/lib_manager.c
@@ -689,11 +689,11 @@ static void __sparse_cache *lib_manager_allocate_store_mem(uint32_t size,
 }
 
 static int lib_manager_store_library(struct lib_manager_dma_ext *dma_ext,
-				     void __sparse_cache *man_buffer,
+				     const void __sparse_cache *man_buffer,
 				     uint32_t lib_id)
 {
 	void __sparse_cache *library_base_address;
-	struct sof_man_fw_desc *man_desc = (struct sof_man_fw_desc *)
+	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;
@@ -711,7 +711,7 @@ static int lib_manager_store_library(struct lib_manager_dma_ext *dma_ext,
 
 #if CONFIG_LIBRARY_AUTH_SUPPORT
 	/* AUTH_PHASE_FIRST - checks library manifest only. */
-	ret = lib_manager_auth_proc((__sparse_force void *)man_buffer,
+	ret = lib_manager_auth_proc((__sparse_force const void *)man_buffer,
 				    MAN_MAX_SIZE_V1_8, AUTH_PHASE_FIRST);
 	if (ret < 0) {
 		rfree((__sparse_force void *)library_base_address);
@@ -721,7 +721,7 @@ static int lib_manager_store_library(struct lib_manager_dma_ext *dma_ext,
 
 	/* Copy data from temp_mft_buf to destination memory (pointed by library_base_address) */
 	memcpy_s((__sparse_force void *)library_base_address, MAN_MAX_SIZE_V1_8,
-		 (__sparse_force void *)man_buffer, MAN_MAX_SIZE_V1_8);
+		 (__sparse_force const void *)man_buffer, MAN_MAX_SIZE_V1_8);
 
 	/* Copy remaining library part into storage buffer */
 	ret = lib_manager_store_data(dma_ext, (uint8_t __sparse_cache *)library_base_address +

From c79af9f8092d66100b9543aec5fcb241573b96f0 Mon Sep 17 00:00:00 2001
From: Adrian Warecki <adrian.warecki@intel.com>
Date: Mon, 4 Mar 2024 17:00:57 +0100
Subject: [PATCH 2/7] lib_manager: Verify preload_page_count from module
 manifest

The preload_page_count value from the loadable library manifest is used to
determine size of allocated memory buffer. If this value is smaller than
the manifest size, it will lead to memory corruption.

Signed-off-by: Adrian Warecki <adrian.warecki@intel.com>
---
 src/library_manager/lib_manager.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/library_manager/lib_manager.c b/src/library_manager/lib_manager.c
index 7cc35c2f91b1..45858e2df23d 100644
--- a/src/library_manager/lib_manager.c
+++ b/src/library_manager/lib_manager.c
@@ -698,6 +698,16 @@ static int lib_manager_store_library(struct lib_manager_dma_ext *dma_ext,
 	uint32_t preload_size = man_desc->header.preload_page_count * PAGE_SZ;
 	int ret;
 
+	/*
+	 * The module manifest structure always has its maximum size regardless of
+	 * the actual size of the manifest.
+	 */
+	if (preload_size < MAN_MAX_SIZE_V1_8) {
+		tr_err(&lib_manager_tr, "Invalid preload_size value %x.", preload_size);
+		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

From d00db647bd7a633362616773ff2ddb89e3ed2583 Mon Sep 17 00:00:00 2001
From: Adrian Warecki <adrian.warecki@intel.com>
Date: Mon, 4 Mar 2024 17:32:06 +0100
Subject: [PATCH 3/7] lib_manager: Simplifying parameter list for
 lib_manager_register_module

Removed pointer to a library manifest from the parameters list of the
lib_manager_register_module function.

Signed-off-by: Adrian Warecki <adrian.warecki@intel.com>
---
 src/include/sof/lib_manager.h     |  6 +++---
 src/ipc/ipc4/helper.c             |  2 +-
 src/library_manager/lib_manager.c | 23 ++++++++++++++++++-----
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/include/sof/lib_manager.h b/src/include/sof/lib_manager.h
index f918602dc02d..cd5f2f25cd04 100644
--- a/src/include/sof/lib_manager.h
+++ b/src/include/sof/lib_manager.h
@@ -127,13 +127,13 @@ void lib_manager_init(void);
 /*
  * \brief Register module on driver list
  *
- * param[in] desc - library manifest descriptor
- * param[in] module_id - used to get manifest offset for module
+ * param[in] component_id - component id coming from ipc config. This function reguires valid
+ * lib_id and module_id fields of component id.
  *
  * Creates new comp_driver_info and initialize it for module from library
  * Adds new module to sof_get()->comp_drivers list
  */
-int lib_manager_register_module(struct sof_man_fw_desc *desc, int module_id);
+int lib_manager_register_module(const uint32_t component_id);
 
 /*
  * \brief Get library module manifest descriptor
diff --git a/src/ipc/ipc4/helper.c b/src/ipc/ipc4/helper.c
index c038af6a1097..f9423fd2aec0 100644
--- a/src/ipc/ipc4/helper.c
+++ b/src/ipc/ipc4/helper.c
@@ -990,7 +990,7 @@ const struct comp_driver *ipc4_get_comp_drv(int module_id)
 #if CONFIG_LIBRARY_MANAGER
 	if (!drv) {
 		/* New module not registered yet. */
-		lib_manager_register_module(desc, module_id);
+		lib_manager_register_module(module_id);
 		drv = ipc4_get_drv(mod->uuid);
 	}
 #endif
diff --git a/src/library_manager/lib_manager.c b/src/library_manager/lib_manager.c
index 45858e2df23d..a95633257d39 100644
--- a/src/library_manager/lib_manager.c
+++ b/src/library_manager/lib_manager.c
@@ -487,15 +487,28 @@ static void lib_manager_update_sof_ctx(void *base_addr, uint32_t lib_id)
 }
 
 #if CONFIG_INTEL_MODULES
-int lib_manager_register_module(struct sof_man_fw_desc *desc, int module_id)
+int lib_manager_register_module(const uint32_t component_id)
 {
-	uint32_t entry_index = LIB_MANAGER_GET_MODULE_INDEX(module_id);
-	/* allocate new  comp_driver_info */
+	const struct lib_manager_mod_ctx *const ctx = lib_manager_get_mod_ctx(component_id);
+	const uint32_t entry_index = LIB_MANAGER_GET_MODULE_INDEX(component_id);
+	const struct sof_man_fw_desc *desc;
 	struct comp_driver_info *new_drv_info;
 	struct comp_driver *drv = NULL;
 	struct sof_man_module *mod;
 	int ret;
 
+	/* Get library manifest based on component_id */
+	if (!ctx || !ctx->base_addr)
+		return -ENOENT;
+
+	desc = (const struct sof_man_fw_desc *)((const char *)ctx->base_addr +
+							      SOF_MAN_ELF_TEXT_OFFSET);
+	if (entry_index >= desc->header.num_module_entries) {
+		tr_err(&lib_manager_tr, "Entry index %d out of bounds.", entry_index);
+		return -ENOENT;
+	}
+
+	/* allocate new comp_driver_info */
 	new_drv_info = rmalloc(SOF_MEM_ZONE_RUNTIME_SHARED, 0,
 			       SOF_MEM_CAPS_RAM | SOF_MEM_FLAG_COHERENT,
 			       sizeof(struct comp_driver_info));
@@ -520,7 +533,7 @@ int lib_manager_register_module(struct sof_man_fw_desc *desc, int module_id)
 	/* Fill the new_drv_info structure with already known parameters */
 	/* Check already registered components */
 	mod = (struct sof_man_module *)((uint8_t *)desc + SOF_MAN_MODULE_OFFSET(entry_index));
-	struct sof_uuid *uid = (struct sof_uuid *)&mod->uuid[0];
+	const struct sof_uuid *uid = (struct sof_uuid *)&mod->uuid[0];
 
 	declare_dynamic_module_adapter(drv, SOF_COMP_MODULE_ADAPTER, uid, &lib_manager_tr);
 
@@ -539,7 +552,7 @@ int lib_manager_register_module(struct sof_man_fw_desc *desc, int module_id)
 }
 
 #else /* CONFIG_INTEL_MODULES */
-int lib_manager_register_module(struct sof_man_fw_desc *desc, int module_id)
+int lib_manager_register_module(const uint32_t component_id)
 {
 	tr_err(&lib_manager_tr,
 	       "lib_manager_register_module(): Dynamic module loading is not supported");

From cf6e0311b71a7f4dfc3ae4ec4bbb363a8753c416 Mon Sep 17 00:00:00 2001
From: Adrian Warecki <adrian.warecki@intel.com>
Date: Thu, 29 Feb 2024 16:12:51 +0100
Subject: [PATCH 4/7] lib_manager: llext_manager: Simplifying parameter list
 for free module

Instead of a pointer to a component driver and ipc config, the
lib_manager_free_module and llext_manager_free_module functions now gets
component id.

Signed-off-by: Adrian Warecki <adrian.warecki@intel.com>
---
 src/audio/module_adapter/module/modules.c |  3 +--
 src/include/sof/lib_manager.h             |  8 +++-----
 src/include/sof/llext_manager.h           |  4 ++--
 src/library_manager/lib_manager.c         | 14 ++++++--------
 src/library_manager/llext_manager.c       |  7 +++----
 5 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/src/audio/module_adapter/module/modules.c b/src/audio/module_adapter/module/modules.c
index 04b8a27e0c50..0671b4603d81 100644
--- a/src/audio/module_adapter/module/modules.c
+++ b/src/audio/module_adapter/module/modules.c
@@ -294,7 +294,6 @@ static int modules_free(struct processing_module *mod)
 {
 	struct comp_dev *dev = mod->dev;
 	struct module_data *md = &mod->priv;
-	struct comp_ipc_config *config = &(mod->dev->ipc_config);
 	int ret;
 
 	comp_info(dev, "modules_free()");
@@ -314,7 +313,7 @@ static int modules_free(struct processing_module *mod)
 
 	if (!md->llext || !llext_unload(&md->llext)) {
 		/* Free module resources allocated in L2 memory. */
-		ret = lib_manager_free_module(mod, config);
+		ret = lib_manager_free_module(dev->ipc_config.id);
 		if (ret < 0)
 			comp_err(dev, "modules_free(), lib_manager_free_module() failed!");
 	}
diff --git a/src/include/sof/lib_manager.h b/src/include/sof/lib_manager.h
index cd5f2f25cd04..d82c10541f58 100644
--- a/src/include/sof/lib_manager.h
+++ b/src/include/sof/lib_manager.h
@@ -162,14 +162,12 @@ uintptr_t lib_manager_allocate_module(struct processing_module *proc,
 /*
  * \brief Free module
  *
- * param[in] drv - component driver
- * param[in] ipc_config - audio component base configuration from IPC at creation
- * param[in] ipc_specific_config - ipc4 base configuration
+ * param[in] component_id - component id coming from ipc config. This function reguires valid
+ * lib_id and module_id fields of component id.
  *
  * Function is responsible to free module resources in HP memory.
  */
-int lib_manager_free_module(struct processing_module *proc,
-			    struct comp_ipc_config *ipc_config);
+int lib_manager_free_module(const uint32_t component_id);
 /*
  * \brief Load library
  *
diff --git a/src/include/sof/llext_manager.h b/src/include/sof/llext_manager.h
index 3f87a43ff9bd..395d4d428638 100644
--- a/src/include/sof/llext_manager.h
+++ b/src/include/sof/llext_manager.h
@@ -14,7 +14,7 @@ struct comp_ipc_config;
 uintptr_t llext_manager_allocate_module(struct processing_module *proc,
 					struct comp_ipc_config *ipc_config,
 					const void *ipc_specific_config, const void **buildinfo);
-int llext_manager_free_module(struct processing_module *proc,
-			      struct comp_ipc_config *ipc_config);
+
+int llext_manager_free_module(const uint32_t component_id);
 
 #endif
diff --git a/src/library_manager/lib_manager.c b/src/library_manager/lib_manager.c
index a95633257d39..90df52b223eb 100644
--- a/src/library_manager/lib_manager.c
+++ b/src/library_manager/lib_manager.c
@@ -396,22 +396,21 @@ uintptr_t lib_manager_allocate_module(struct processing_module *proc,
 	return 0;
 }
 
-int lib_manager_free_module(struct processing_module *proc,
-			    struct comp_ipc_config *ipc_config)
+int lib_manager_free_module(const uint32_t component_id)
 {
 	struct sof_man_fw_desc *desc;
 	struct sof_man_module *mod;
-	uint32_t module_id = IPC4_MOD_ID(ipc_config->id);
+	const uint32_t module_id = IPC4_MOD_ID(component_id);
 	uint32_t entry_index = LIB_MANAGER_GET_MODULE_INDEX(module_id);
 	int ret;
 
-	tr_dbg(&lib_manager_tr, "lib_manager_free_module(): mod_id: %#x", ipc_config->id);
+	tr_dbg(&lib_manager_tr, "lib_manager_free_module(): mod_id: %#x", component_id);
 
 	desc = lib_manager_get_library_module_desc(module_id);
 	mod = (struct sof_man_module *)((char *)desc + SOF_MAN_MODULE_OFFSET(entry_index));
 
 	if (module_is_llext(mod))
-		return llext_manager_free_module(proc, ipc_config);
+		return llext_manager_free_module(component_id);
 
 	ret = lib_manager_unload_module(mod);
 	if (ret < 0)
@@ -423,7 +422,7 @@ int lib_manager_free_module(struct processing_module *proc,
 		return ret;
 #endif /* CONFIG_LIBCODE_MODULE_SUPPORT */
 
-	ret = lib_manager_free_module_instance(module_id, IPC4_INST_ID(ipc_config->id), mod);
+	ret = lib_manager_free_module_instance(module_id, IPC4_INST_ID(component_id), mod);
 	if (ret < 0) {
 		tr_err(&lib_manager_tr,
 		       "lib_manager_free_module(): free module instance failed: %d", ret);
@@ -445,8 +444,7 @@ uintptr_t lib_manager_allocate_module(struct processing_module *proc,
 	return 0;
 }
 
-int lib_manager_free_module(struct processing_module *proc,
-			    struct comp_ipc_config *ipc_config)
+int lib_manager_free_module(const uint32_t component_id)
 {
 	/* Since we cannot allocate the freeing is not considered to be an error */
 	tr_warn(&lib_manager_tr,
diff --git a/src/library_manager/llext_manager.c b/src/library_manager/llext_manager.c
index 23ded81f9a10..e84a06ead79a 100644
--- a/src/library_manager/llext_manager.c
+++ b/src/library_manager/llext_manager.c
@@ -272,16 +272,15 @@ uintptr_t llext_manager_allocate_module(struct processing_module *proc,
 	return mod_manifest->module.entry_point;
 }
 
-int llext_manager_free_module(struct processing_module *proc,
-			      struct comp_ipc_config *ipc_config)
+int llext_manager_free_module(const uint32_t component_id)
 {
 	struct sof_man_fw_desc *desc;
 	struct sof_man_module *mod;
-	uint32_t module_id = IPC4_MOD_ID(ipc_config->id);
+	const uint32_t module_id = IPC4_MOD_ID(component_id);
 	uint32_t entry_index = LIB_MANAGER_GET_MODULE_INDEX(module_id);
 	int ret;
 
-	tr_dbg(&lib_manager_tr, "llext_manager_free_module(): mod_id: %#x", ipc_config->id);
+	tr_dbg(&lib_manager_tr, "llext_manager_free_module(): mod_id: %#x", component_id);
 
 	desc = lib_manager_get_library_module_desc(module_id);
 	mod = (struct sof_man_module *)((char *)desc + SOF_MAN_MODULE_OFFSET(entry_index));

From fdbe2a03766bdd0ea2bc4b99a0af49e527b3fe70 Mon Sep 17 00:00:00 2001
From: Adrian Warecki <adrian.warecki@intel.com>
Date: Wed, 28 Feb 2024 17:25:37 +0100
Subject: [PATCH 5/7] lib_manager: llext_manager: Add const modifier to module
 manifest pointers

To prevent unintentional modification of a loadable library manifest,
a const modifier has been added to all variables pointing to it.

Signed-off-by: Adrian Warecki <adrian.warecki@intel.com>
---
 src/include/sof/ipc/topology.h      |  2 +-
 src/ipc/ipc4/helper.c               |  6 +++---
 src/library_manager/lib_manager.c   | 12 ++++++------
 src/library_manager/llext_manager.c | 12 ++++++------
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/include/sof/ipc/topology.h b/src/include/sof/ipc/topology.h
index 86a6bebdb6f2..825898a09811 100644
--- a/src/include/sof/ipc/topology.h
+++ b/src/include/sof/ipc/topology.h
@@ -50,7 +50,7 @@ struct ipc_comp_dev;
 const struct comp_driver *ipc4_get_comp_drv(int module_id);
 struct comp_dev *ipc4_get_comp_dev(uint32_t comp_id);
 int ipc4_add_comp_dev(struct comp_dev *dev);
-const struct comp_driver *ipc4_get_drv(uint8_t *uuid);
+const struct comp_driver *ipc4_get_drv(const uint8_t *uuid);
 int ipc4_chain_manager_create(struct ipc4_chain_dma *cdma);
 int ipc4_chain_dma_state(struct comp_dev *dev, struct ipc4_chain_dma *cdma);
 int ipc4_create_chain_dma(struct ipc *ipc, struct ipc4_chain_dma *cdma);
diff --git a/src/ipc/ipc4/helper.c b/src/ipc/ipc4/helper.c
index f9423fd2aec0..ad14bac53685 100644
--- a/src/ipc/ipc4/helper.c
+++ b/src/ipc/ipc4/helper.c
@@ -728,7 +728,7 @@ int ipc4_chain_manager_create(struct ipc4_chain_dma *cdma)
 	const struct comp_driver *drv;
 	struct comp_dev *dev;
 
-	drv = ipc4_get_drv((uint8_t *)&uuid);
+	drv = ipc4_get_drv((const uint8_t *)&uuid);
 	if (!drv)
 		return -EINVAL;
 
@@ -864,7 +864,7 @@ int ipc4_process_on_core(uint32_t core, bool blocking)
 	return IPC4_SUCCESS;
 }
 
-const struct comp_driver *ipc4_get_drv(uint8_t *uuid)
+const struct comp_driver *ipc4_get_drv(const uint8_t *uuid)
 {
 	struct comp_driver_list *drivers = comp_drivers_get();
 	struct list_item *clist;
@@ -934,7 +934,7 @@ static const struct comp_driver *ipc4_library_get_drv(int module_id)
 		mod_uuid = &uuid_map[i];
 
 		if (mod_uuid->module_id == module_id)
-			return ipc4_get_drv((uint8_t *)&mod_uuid->uuid);
+			return ipc4_get_drv((const uint8_t *)&mod_uuid->uuid);
 	}
 
 	tr_err(&comp_tr, "ipc4_library_get_drv(): Unsupported module ID %#x\n", module_id);
diff --git a/src/library_manager/lib_manager.c b/src/library_manager/lib_manager.c
index 90df52b223eb..e36e551cec8a 100644
--- a/src/library_manager/lib_manager.c
+++ b/src/library_manager/lib_manager.c
@@ -279,7 +279,7 @@ static int lib_manager_unload_libcode_modules(const uint32_t module_id,
 
 static void __sparse_cache *lib_manager_get_instance_bss_address(uint32_t module_id,
 								 uint32_t instance_id,
-								 struct sof_man_module *mod)
+								 const struct sof_man_module *mod)
 {
 	uint32_t instance_bss_size =
 		 mod->segment[SOF_MAN_SEGMENT_BSS].flags.r.length / mod->instance_max_count;
@@ -296,7 +296,7 @@ static void __sparse_cache *lib_manager_get_instance_bss_address(uint32_t module
 }
 
 static int lib_manager_allocate_module_instance(uint32_t module_id, uint32_t instance_id,
-						uint32_t is_pages, struct sof_man_module *mod)
+						uint32_t is_pages, const struct sof_man_module *mod)
 {
 	uint32_t bss_size =
 			(mod->segment[SOF_MAN_SEGMENT_BSS].flags.r.length / mod->instance_max_count)
@@ -324,7 +324,7 @@ static int lib_manager_allocate_module_instance(uint32_t module_id, uint32_t ins
 }
 
 static int lib_manager_free_module_instance(uint32_t module_id, uint32_t instance_id,
-					    struct sof_man_module *mod)
+					    const struct sof_man_module *mod)
 {
 	uint32_t bss_size =
 			(mod->segment[SOF_MAN_SEGMENT_BSS].flags.r.length / mod->instance_max_count)
@@ -337,7 +337,7 @@ static int lib_manager_free_module_instance(uint32_t module_id, uint32_t instanc
 	return sys_mm_drv_unmap_region((__sparse_force void *)va_base, bss_size);
 }
 
-static bool module_is_llext(struct sof_man_module *mod)
+static inline bool module_is_llext(const struct sof_man_module *mod)
 {
 	return mod->type.load_type == SOF_MAN_MOD_TYPE_LLEXT;
 }
@@ -347,7 +347,7 @@ uintptr_t lib_manager_allocate_module(struct processing_module *proc,
 				      const void *ipc_specific_config, const void **buildinfo)
 {
 	struct sof_man_fw_desc *desc;
-	struct sof_man_module *mod;
+	const struct sof_man_module *mod;
 	const struct ipc4_base_module_cfg *base_cfg = ipc_specific_config;
 	int ret;
 	uint32_t module_id = IPC4_MOD_ID(ipc_config->id);
@@ -399,7 +399,7 @@ uintptr_t lib_manager_allocate_module(struct processing_module *proc,
 int lib_manager_free_module(const uint32_t component_id)
 {
 	struct sof_man_fw_desc *desc;
-	struct sof_man_module *mod;
+	const struct sof_man_module *mod;
 	const uint32_t module_id = IPC4_MOD_ID(component_id);
 	uint32_t entry_index = LIB_MANAGER_GET_MODULE_INDEX(module_id);
 	int ret;
diff --git a/src/library_manager/llext_manager.c b/src/library_manager/llext_manager.c
index e84a06ead79a..8c8305614516 100644
--- a/src/library_manager/llext_manager.c
+++ b/src/library_manager/llext_manager.c
@@ -73,7 +73,7 @@ static int llext_manager_load_data_from_storage(void __sparse_cache *vma, void *
 	return memcpy_s((__sparse_force void *)vma, size, s_addr, size);
 }
 
-static int llext_manager_load_module(uint32_t module_id, struct sof_man_module *mod,
+static int llext_manager_load_module(uint32_t module_id, const struct sof_man_module *mod,
 				     struct sof_man_fw_desc *desc)
 {
 	struct lib_manager_mod_ctx *ctx = lib_manager_get_mod_ctx(module_id);
@@ -116,7 +116,7 @@ static int llext_manager_load_module(uint32_t module_id, struct sof_man_module *
 	return ret;
 }
 
-static int llext_manager_unload_module(uint32_t module_id, struct sof_man_module *mod,
+static int llext_manager_unload_module(uint32_t module_id, const struct sof_man_module *mod,
 				       struct sof_man_fw_desc *desc)
 {
 	struct lib_manager_mod_ctx *ctx = lib_manager_get_mod_ctx(module_id);
@@ -136,13 +136,13 @@ static int llext_manager_unload_module(uint32_t module_id, struct sof_man_module
 }
 
 static void __sparse_cache *llext_manager_get_bss_address(uint32_t module_id,
-							  struct sof_man_module *mod)
+							  const struct sof_man_module *mod)
 {
 	return (void __sparse_cache *)mod->segment[SOF_MAN_SEGMENT_BSS].v_base_addr;
 }
 
 static int llext_manager_allocate_module_bss(uint32_t module_id,
-					     struct sof_man_module *mod)
+					     const struct sof_man_module *mod)
 {
 	struct lib_manager_mod_ctx *ctx = lib_manager_get_mod_ctx(module_id);
 	size_t bss_size = ctx->segment_size[SOF_MAN_SEGMENT_BSS];
@@ -158,7 +158,7 @@ static int llext_manager_allocate_module_bss(uint32_t module_id,
 }
 
 static int llext_manager_free_module_bss(uint32_t module_id,
-					 struct sof_man_module *mod)
+					 const struct sof_man_module *mod)
 {
 	struct lib_manager_mod_ctx *ctx = lib_manager_get_mod_ctx(module_id);
 	size_t bss_size = ctx->segment_size[SOF_MAN_SEGMENT_BSS];
@@ -275,7 +275,7 @@ uintptr_t llext_manager_allocate_module(struct processing_module *proc,
 int llext_manager_free_module(const uint32_t component_id)
 {
 	struct sof_man_fw_desc *desc;
-	struct sof_man_module *mod;
+	const struct sof_man_module *mod;
 	const uint32_t module_id = IPC4_MOD_ID(component_id);
 	uint32_t entry_index = LIB_MANAGER_GET_MODULE_INDEX(module_id);
 	int ret;

From 4887029ccf44056335d5274baad71a51f66b0ffd Mon Sep 17 00:00:00 2001
From: Adrian Warecki <adrian.warecki@intel.com>
Date: Thu, 29 Feb 2024 16:46:13 +0100
Subject: [PATCH 6/7] lib_manager: llext_manager: Add const to module allocate
 functions

Added a const modifier to the ipc_config parameter passed to functions
lib_manager_allocate_module and llext_manager_allocate_module.

Signed-off-by: Adrian Warecki <adrian.warecki@intel.com>
---
 src/include/sof/lib_manager.h       | 2 +-
 src/include/sof/llext_manager.h     | 2 +-
 src/library_manager/lib_manager.c   | 4 ++--
 src/library_manager/llext_manager.c | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/include/sof/lib_manager.h b/src/include/sof/lib_manager.h
index d82c10541f58..a396c1daf282 100644
--- a/src/include/sof/lib_manager.h
+++ b/src/include/sof/lib_manager.h
@@ -156,7 +156,7 @@ struct processing_module;
  * (WIP) These feature will contain module validation and proper memory management.
  */
 uintptr_t lib_manager_allocate_module(struct processing_module *proc,
-				      struct comp_ipc_config *ipc_config,
+				      const struct comp_ipc_config *ipc_config,
 				      const void *ipc_specific_config, const void **buildinfo);
 
 /*
diff --git a/src/include/sof/llext_manager.h b/src/include/sof/llext_manager.h
index 395d4d428638..9730fea4c377 100644
--- a/src/include/sof/llext_manager.h
+++ b/src/include/sof/llext_manager.h
@@ -12,7 +12,7 @@ struct comp_driver;
 struct comp_ipc_config;
 
 uintptr_t llext_manager_allocate_module(struct processing_module *proc,
-					struct comp_ipc_config *ipc_config,
+					const struct comp_ipc_config *ipc_config,
 					const void *ipc_specific_config, const void **buildinfo);
 
 int llext_manager_free_module(const uint32_t component_id);
diff --git a/src/library_manager/lib_manager.c b/src/library_manager/lib_manager.c
index e36e551cec8a..9c9474ed577d 100644
--- a/src/library_manager/lib_manager.c
+++ b/src/library_manager/lib_manager.c
@@ -343,7 +343,7 @@ static inline bool module_is_llext(const struct sof_man_module *mod)
 }
 
 uintptr_t lib_manager_allocate_module(struct processing_module *proc,
-				      struct comp_ipc_config *ipc_config,
+				      const struct comp_ipc_config *ipc_config,
 				      const void *ipc_specific_config, const void **buildinfo)
 {
 	struct sof_man_fw_desc *desc;
@@ -436,7 +436,7 @@ int lib_manager_free_module(const uint32_t component_id)
 #define PAGE_SZ		4096 /* equals to MAN_PAGE_SIZE used by rimage */
 
 uintptr_t lib_manager_allocate_module(struct processing_module *proc,
-				      struct comp_ipc_config *ipc_config,
+				      const struct comp_ipc_config *ipc_config,
 				      const void *ipc_specific_config, const void **buildinfo)
 {
 	tr_err(&lib_manager_tr,
diff --git a/src/library_manager/llext_manager.c b/src/library_manager/llext_manager.c
index 8c8305614516..403255fe1f58 100644
--- a/src/library_manager/llext_manager.c
+++ b/src/library_manager/llext_manager.c
@@ -230,7 +230,7 @@ static int llext_manager_link(struct sof_man_fw_desc *desc, struct sof_man_modul
 }
 
 uintptr_t llext_manager_allocate_module(struct processing_module *proc,
-					struct comp_ipc_config *ipc_config,
+					const struct comp_ipc_config *ipc_config,
 					const void *ipc_specific_config, const void **buildinfo)
 {
 	struct sof_man_fw_desc *desc;

From 5950a18afba45a34be9dca657b76293315e9f684 Mon Sep 17 00:00:00 2001
From: Adrian Warecki <adrian.warecki@intel.com>
Date: Thu, 29 Feb 2024 10:21:47 +0100
Subject: [PATCH 7/7] llext_manager: Remove unused desc parameter

Removed unused desc parameter from llext_manager_load_module and
llext_manager_unload_module functions.

Signed-off-by: Adrian Warecki <adrian.warecki@intel.com>
---
 src/library_manager/llext_manager.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/library_manager/llext_manager.c b/src/library_manager/llext_manager.c
index 403255fe1f58..2f0afb6ddbe5 100644
--- a/src/library_manager/llext_manager.c
+++ b/src/library_manager/llext_manager.c
@@ -73,8 +73,7 @@ static int llext_manager_load_data_from_storage(void __sparse_cache *vma, void *
 	return memcpy_s((__sparse_force void *)vma, size, s_addr, size);
 }
 
-static int llext_manager_load_module(uint32_t module_id, const struct sof_man_module *mod,
-				     struct sof_man_fw_desc *desc)
+static int llext_manager_load_module(uint32_t module_id, const struct sof_man_module *mod)
 {
 	struct lib_manager_mod_ctx *ctx = lib_manager_get_mod_ctx(module_id);
 	uint8_t *load_base = (uint8_t *)ctx->base_addr;
@@ -116,8 +115,7 @@ static int llext_manager_load_module(uint32_t module_id, const struct sof_man_mo
 	return ret;
 }
 
-static int llext_manager_unload_module(uint32_t module_id, const struct sof_man_module *mod,
-				       struct sof_man_fw_desc *desc)
+static int llext_manager_unload_module(uint32_t module_id, const struct sof_man_module *mod)
 {
 	struct lib_manager_mod_ctx *ctx = lib_manager_get_mod_ctx(module_id);
 	void __sparse_cache *va_base_text = (void __sparse_cache *)
@@ -258,7 +256,7 @@ uintptr_t llext_manager_allocate_module(struct processing_module *proc,
 		return 0;
 
 	/* Map .text and the rest as .data */
-	ret = llext_manager_load_module(module_id, mod, desc);
+	ret = llext_manager_load_module(module_id, mod);
 	if (ret < 0)
 		return 0;
 
@@ -285,7 +283,7 @@ int llext_manager_free_module(const uint32_t component_id)
 	desc = lib_manager_get_library_module_desc(module_id);
 	mod = (struct sof_man_module *)((char *)desc + SOF_MAN_MODULE_OFFSET(entry_index));
 
-	ret = llext_manager_unload_module(module_id, mod, desc);
+	ret = llext_manager_unload_module(module_id, mod);
 	if (ret < 0)
 		return ret;