Skip to content

drivers: firmware: imx: fix dependency for IMX_SEC_ENCLAVE and use-after-free #32

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
ernestvh wants to merge 2 commits into
base: lf-6.12.y
Choose a base branch
from
+7 −6
Open

drivers: firmware: imx: fix dependency for IMX_SEC_ENCLAVE and use-after-free #32

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1986592
drivers: firmware: imx: fix dependency for IMX_SEC_ENCLAVE
MaxKrummenacher Sep 8, 2025
eb38225
drivers: firmware: imx: fix reference counting of se_kobj
Sep 17, 2025
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
2 changes: 1 addition & 1 deletion drivers/firmware/imx/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ config IMX_SCMI_MISC_DRV

config IMX_SEC_ENCLAVE
tristate "i.MX Embedded Secure Enclave - EdgeLock Enclave Firmware driver."
depends on IMX_MBOX && ARCH_MXC && ARM64
depends on NVMEM_IMX_OCOTP_SCU && IMX_MBOX && ARCH_MXC && ARM64
Copy link
Copy Markdown
Contributor

@iuliana-prodan iuliana-prodan Sep 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM - depends on ensures the enclave driver can’t be y when NVMEM_IMX_OCOTP_SCU is m, avoiding probe defers.
Good catch!

Copy link
Copy Markdown
Author

@ernestvh ernestvh Sep 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Credit to @MaxKrummenacher!

Copy link
Copy Markdown
Contributor

@dbaluta dbaluta Sep 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Credit to @MaxKrummenacher!

@ernestvh add @MaxKrummenacher as Suggested-by or Reported-by to give credit.

Also, NVMEM_IMX_OCOTP_SCU is enabled only for SCU (System controller unit) based platforms right (like 8qxp/8qm)?

So it means that IMX_SEC_ENCLAVE is only available on this boards.

Copy link
Copy Markdown
Contributor

@MaxKrummenacher MaxKrummenacher Oct 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So it means that IMX_SEC_ENCLAVE is only available on this boards.

The current imx_v8_defconfig enables NVMEM_IMX_OCOTP_SCU, so IMX_SEC_ENCLAVE would be there for boards without an SCU.

But you are right the this seems not the proper or complete solution to forcing IMX_SEC_ENCLAVE=m when the OCOTP driver is m.

Assuming it to handle the =m vs. =y issue correctly probably the following would be better:

depends on (NVMEM_IMX_OCOTP_SCU || NVMEM_IMX_OCOTP_ELE ) && IMX_MBOX && ARCH_MXC && ARM64

select FW_LOADER
default m if ARCH_MXC

Expand Down