Thank you for your contribution! Sashiko AI review found 3 potential issues to consider: - [High] media: iris: missing qcom_pas_metadata_release() in iris_fw_load() - [Medium] media: iris: unzeroed carveout memory scanned by iris_detect_firmware() - [Low] media: iris: missing kernel-doc entry for pas_ctx in struct iris_core --
commit 06c574841baf80a5b2f096e918c8cad3e79ad9f0 Author: Mukesh Ojha <[email protected]> media: iris: migrate firmware loading to qcom_mdt_pas_load() and qcom_pas_prepare_and_auth_reset() This commit embeds a struct qcom_pas_context in struct iris_core and migrates Iris firmware loading from qcom_mdt_load() and qcom_pas_auth_and_reset() to qcom_mdt_pas_load() and qcom_pas_prepare_and_auth_reset(). > diff --git a/drivers/media/platform/qcom/iris/iris_core.h > b/drivers/media/platform/qcom/iris/iris_core.h > index 3e4cf652bf39a..ac73bda072f85 100644 > --- a/drivers/media/platform/qcom/iris/iris_core.h > +++ b/drivers/media/platform/qcom/iris/iris_core.h [ ... ] > @@ -129,6 +130,7 @@ struct iris_core { > struct platform_inst_fw_cap > inst_fw_caps_dec[INST_FW_CAP_MAX]; > struct platform_inst_fw_cap > inst_fw_caps_enc[INST_FW_CAP_MAX]; > struct dma_iova_state *iova_state; > + struct qcom_pas_context pas_ctx; > }; [Severity: Low] struct iris_core has a kernel-doc comment block describing its members, so adding pas_ctx without an @pas_ctx entry will trigger a kernel-doc warning. > diff --git a/drivers/media/platform/qcom/iris/iris_firmware.c > b/drivers/media/platform/qcom/iris/iris_firmware.c > index 21f57d37da187..b701a7f43514b 100644 > --- a/drivers/media/platform/qcom/iris/iris_firmware.c > +++ b/drivers/media/platform/qcom/iris/iris_firmware.c > @@ -201,21 +201,20 @@ static int iris_load_fw_to_memory(struct iris_core > *core) > goto err_release_fw; > } > > - mem_virt = memremap(mem_phys, res_size, MEMREMAP_WC); > - if (!mem_virt) { > - ret = -ENOMEM; > - goto err_release_fw; > - } > - > - memset(mem_virt, 0, res_size); > - > - ret = qcom_mdt_load(dev, firmware, fw_name, > - IRIS_PAS_ID, mem_virt, mem_phys, res_size, NULL); > + qcom_pas_context_init(&core->pas_ctx, dev, IRIS_PAS_ID, mem_phys, > + res_size); > + > + ret = qcom_mdt_pas_load(&core->pas_ctx, firmware, fw_name, NULL); > + if (!ret) { > + mem_virt = memremap(mem_phys, res_size, MEMREMAP_WC); > + if (!mem_virt) { > + ret = -ENOMEM; > + goto err_release_fw; > + } > > - if (!ret) > iris_detect_firmware(core, fw_name, mem_virt, res_size, desc); > - > - memunmap(mem_virt); > + memunmap(mem_virt); > + } [Severity: Medium] Can removing memset(mem_virt, 0, res_size) cause iris_detect_firmware() to scan uninitialized carveout memory? qcom_mdt_pas_load() -> qcom_mdt_load_no_init() only populates individual PT_LOAD segments and their BSS tails, leaving inter-segment gaps and the trailing [fw_size, res_size) region untouched. When iris_detect_firmware() subsequently scans all res_size bytes via iris_detect_gen2_from_fwdata() on a dual-generation platform with a firmware-name override, stale data in the unwritten carveout (for example after a warm reboot or prior Gen2 load) can cause a smaller Gen1 firmware image to be misclassified as Gen2. [ ... ] > @@ -233,7 +232,7 @@ int iris_fw_load(struct iris_core *core) > return ret; > } > > - ret = qcom_pas_auth_and_reset(IRIS_PAS_ID); > + ret = qcom_pas_prepare_and_auth_reset(&core->pas_ctx); > if (ret) { > dev_err(core->dev, "auth and reset failed: %d\n", ret); > return ret; [Severity: High] As reported by Konrad Dybcio on v1 [1], does this leak the PAS metadata buffer stored in core->pas_ctx.ptr? Unlike qcom_mdt_load(), which passes a NULL context to __qcom_mdt_pas_init(), qcom_mdt_pas_load() passes &core->pas_ctx to qcom_pas_init_image(), which retains the allocated DMA or TEE metadata buffer in core->pas_ctx.ptr: drivers/firmware/qcom/qcom_scm.c:qcom_scm_pas_init_image() { ... if (ret < 0 || !ctx) { dma_free_coherent(dev, size, mdata_buf, mdata_phys); } else if (ctx) { ctx->ptr = mdata_buf; ctx->phys = mdata_phys; ctx->size = size; } ... } Neither qcom_pas_prepare_and_auth_reset() nor iris_firmware.c calls qcom_pas_metadata_release(&core->pas_ctx), so the metadata buffer is leaked on every firmware load (and overwritten when qcom_pas_context_init() zeroes core->pas_ctx on subsequent loads or error recovery). [1] https://lore.kernel.org/r/[email protected] -- Sashiko AI review ยท https://sashiko.dev/#/patchset/[email protected]?part=4
