From: sashiko-bot@kernel.org
To: "Anvesh Jain P" <anvesh.p@oss.qualcomm.com>
Cc: devicetree@vger.kernel.org, robh@kernel.org, conor+dt@kernel.org
Subject: Re: [PATCH v3 2/4] remoteproc: qcom: pas: Support secondary images
Date: Wed, 18 Nov 2026 15:56:07 +0000 [thread overview]
Message-ID: <sashiko-outbox-221390@kernel.org> (raw)
In-Reply-To: <20261118-oob-support-glymur-v3-2-2cbdfe208d56@oss.qualcomm.com>
Thank you for your contribution! Sashiko AI review found 3 potential
issues to consider:
- [Medium] remoteproc: qcom: pas: masked secondary shutdown errors in
qcom_pas_stop()
- [Medium] remoteproc: qcom: pas: unauthenticated PAS shutdown in
qcom_pas_start()
- [Medium] remoteproc: qcom: pas: firmware leak on boot failure after
qcom_pas_load()
--
commit f4e5bc32dd6dbd8e248f2fc47b7078b505ef5dfc
Author: Anvesh Jain P <anvesh.p@oss.qualcomm.com>
remoteproc: qcom: pas: Support secondary images
This commit adds PAS remoteproc support for loading, authenticating,
mapping, shutting down, and releasing a secondary image and its DTB.
> diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c
> index e7dfad27e5263..1c8c0c22c34d1 100644
> --- a/drivers/remoteproc/qcom_q6v5_pas.c
> +++ b/drivers/remoteproc/qcom_q6v5_pas.c
[ ... ]
> @@ -252,6 +288,10 @@ static int qcom_pas_unprepare(struct rproc *rproc)
> qcom_pas_metadata_release(pas->pas_ctx);
> if (pas->dtb_pas_id)
> qcom_pas_metadata_release(pas->dtb_pas_ctx);
> + if (pas->secondary_pas_id)
> + qcom_pas_metadata_release(pas->secondary_pas_ctx);
> + if (pas->secondary_dtb_pas_id)
> + qcom_pas_metadata_release(pas->secondary_dtb_pas_ctx);
>
> return 0;
> }
> @@ -269,19 +309,29 @@ static int qcom_pas_load(struct rproc *rproc, const struct firmware *fw)
> if (pas->lite_dtb_pas_id)
> qcom_pas_shutdown(pas->lite_dtb_pas_id);
>
> - if (pas->dtb_pas_id) {
> - ret = request_firmware(&pas->dtb_firmware, pas->dtb_firmware_name, pas->dev);
> + if (pas->secondary_dtb_pas_id) {
> + ret = request_firmware(&pas->secondary_dtb_firmware,
> + pas->secondary_dtb_firmware_name, pas->dev);
> if (ret) {
> - dev_err(pas->dev, "request_firmware failed for %s: %d\n",
> - pas->dtb_firmware_name, ret);
> + qcom_pas_release_firmware(pas);
> return ret;
> }
> + }
>
> - ret = qcom_mdt_pas_load(pas->dtb_pas_ctx, pas->dtb_firmware,
> - pas->dtb_firmware_name, &pas->dtb_mem_reloc);
> + if (pas->secondary_pas_id) {
> + ret = request_firmware(&pas->secondary_firmware,
> + pas->secondary_firmware_name, pas->dev);
> + if (ret) {
> + qcom_pas_release_firmware(pas);
> + return ret;
> + }
> + }
> +
> + if (pas->dtb_pas_id) {
> + ret = request_firmware(&pas->dtb_firmware, pas->dtb_firmware_name,
> + pas->dev);
> if (ret) {
> - qcom_pas_metadata_release(pas->dtb_pas_ctx);
> - release_firmware(pas->dtb_firmware);
> + qcom_pas_release_firmware(pas);
> return ret;
> }
> }
[Severity: Medium]
Can this leak pas->secondary_dtb_firmware, pas->secondary_firmware, and
pas->dtb_firmware if boot fails after qcom_pas_load() succeeds?
qcom_pas_release_firmware() is only called in qcom_pas_start() on success
or under the disable_irqs error label. If rproc_prepare_subdevices()
fails in rproc_start() before rproc->ops->start() is reached, or if
qcom_q6v5_prepare() fails at the top of qcom_pas_start() and returns early,
none of those firmware objects are released and pas->firmware is not
cleared. A later boot or recovery attempt will then overwrite those
pointers in qcom_pas_load().
Calling qcom_pas_release_firmware(pas) and clearing pas->firmware in
qcom_pas_unprepare() (or jumping to the cleanup path when
qcom_q6v5_prepare() fails) would avoid the leak.
> @@ -338,10 +388,51 @@ static int qcom_pas_start(struct rproc *rproc)
> goto disable_cx_supply;
> }
>
> + if (pas->secondary_dtb_pas_id) {
> + ret = qcom_mdt_pas_load(pas->secondary_dtb_pas_ctx,
> + pas->secondary_dtb_firmware,
> + pas->secondary_dtb_firmware_name,
> + &pas->secondary_dtb_mem_reloc);
> + if (ret)
> + goto release_secondary_dtb_metadata;
> +
> + ret = qcom_pas_map_carveout(rproc, pas->secondary_dtb_mem_phys,
> + pas->secondary_dtb_mem_size);
> + if (ret)
> + goto release_secondary_dtb_metadata;
> +
> + ret = qcom_pas_prepare_and_auth_reset(pas->secondary_dtb_pas_ctx);
> + if (ret)
> + goto unmap_secondary_dtb_carveout;
> + }
> +
> + if (pas->secondary_pas_id) {
> + ret = qcom_mdt_pas_load(pas->secondary_pas_ctx,
> + pas->secondary_firmware,
> + pas->secondary_firmware_name,
> + &pas->secondary_mem_reloc);
> + if (ret)
> + goto release_secondary_metadata;
> +
> + ret = qcom_pas_map_carveout(rproc, pas->secondary_mem_phys,
> + pas->secondary_mem_size);
> + if (ret)
> + goto release_secondary_metadata;
> +
> + ret = qcom_pas_prepare_and_auth_reset(pas->secondary_pas_ctx);
> + if (ret)
> + goto unmap_secondary_carveout;
> + }
> +
> if (pas->dtb_pas_id) {
> + ret = qcom_mdt_pas_load(pas->dtb_pas_ctx, pas->dtb_firmware,
> + pas->dtb_firmware_name, &pas->dtb_mem_reloc);
> + if (ret)
> + goto release_dtb_metadata;
> +
> ret = qcom_pas_map_carveout(rproc, pas->dtb_mem_phys, pas->dtb_mem_size);
> if (ret)
> - goto disable_px_supply;
> + goto release_dtb_metadata;
>
> ret = qcom_pas_prepare_and_auth_reset(pas->dtb_pas_ctx);
> if (ret) {
> @@ -372,13 +463,17 @@ static int qcom_pas_start(struct rproc *rproc)
> ret = qcom_q6v5_wait_for_start(&pas->q6v5, msecs_to_jiffies(5000));
> if (ret == -ETIMEDOUT) {
> dev_err(pas->dev, "start timed out\n");
> - qcom_pas_shutdown(pas->pas_id);
> goto unmap_carveout;
> }
>
> qcom_pas_metadata_release(pas->pas_ctx);
> if (pas->dtb_pas_id)
> qcom_pas_metadata_release(pas->dtb_pas_ctx);
> + if (pas->secondary_pas_id)
> + qcom_pas_metadata_release(pas->secondary_pas_ctx);
> + if (pas->secondary_dtb_pas_id)
> + qcom_pas_metadata_release(pas->secondary_dtb_pas_ctx);
> + qcom_pas_release_firmware(pas);
>
> /* firmware is used to pass reference from qcom_pas_start(), drop it now */
> pas->firmware = NULL;
> @@ -386,16 +481,37 @@ static int qcom_pas_start(struct rproc *rproc)
> return 0;
>
> unmap_carveout:
> + qcom_pas_shutdown(pas->pas_id);
> qcom_pas_unmap_carveout(rproc, pas->mem_phys, pas->mem_size);
> release_pas_metadata:
> qcom_pas_metadata_release(pas->pas_ctx);
> - if (pas->dtb_pas_id)
> - qcom_pas_metadata_release(pas->dtb_pas_ctx);
> -
> unmap_dtb_carveout:
> + if (pas->dtb_pas_id) {
> + qcom_pas_shutdown(pas->dtb_pas_id);
> + qcom_pas_unmap_carveout(rproc, pas->dtb_mem_phys,
> + pas->dtb_mem_size);
> + }
> +release_dtb_metadata:
> if (pas->dtb_pas_id)
> - qcom_pas_unmap_carveout(rproc, pas->dtb_mem_phys, pas->dtb_mem_size);
> -disable_px_supply:
> + qcom_pas_metadata_release(pas->dtb_pas_ctx);
> +unmap_secondary_carveout:
> + if (pas->secondary_pas_id) {
> + qcom_pas_shutdown(pas->secondary_pas_id);
> + qcom_pas_unmap_carveout(rproc, pas->secondary_mem_phys,
> + pas->secondary_mem_size);
> + }
> +release_secondary_metadata:
> + if (pas->secondary_pas_id)
> + qcom_pas_metadata_release(pas->secondary_pas_ctx);
> +unmap_secondary_dtb_carveout:
> + if (pas->secondary_dtb_pas_id) {
> + qcom_pas_shutdown(pas->secondary_dtb_pas_id);
> + qcom_pas_unmap_carveout(rproc, pas->secondary_dtb_mem_phys,
> + pas->secondary_dtb_mem_size);
> + }
> +release_secondary_dtb_metadata:
> + if (pas->secondary_dtb_pas_id)
> + qcom_pas_metadata_release(pas->secondary_dtb_pas_ctx);
[Severity: Medium]
Does jumping to the unmap_*_carveout labels when
qcom_pas_prepare_and_auth_reset() fails call qcom_pas_shutdown() on a PAS
context that failed authentication?
Each image maps its carveout before calling
qcom_pas_prepare_and_auth_reset(), and on failure jumps to its own
unmap_*_carveout label, which now executes qcom_pas_shutdown() before
qcom_pas_unmap_carveout(). That issues an unbalanced PAS shutdown call to
TrustZone for an image that was never authenticated or brought out of
reset. Separating the shutdown labels from the unmap_*_carveout labels
would ensure qcom_pas_shutdown() is only called for PAS IDs whose
qcom_pas_prepare_and_auth_reset() succeeded.
> @@ -440,9 +557,30 @@ static int qcom_pas_stop(struct rproc *rproc)
> if (ret == -ETIMEDOUT)
> dev_err(pas->dev, "timed out on wait\n");
>
> + if (pas->secondary_pas_id) {
> + ret = qcom_pas_shutdown(pas->secondary_pas_id);
> + if (ret && pas->decrypt_shutdown)
> + ret = qcom_pas_shutdown_poll_decrypt(pas->secondary_pas_id);
> + if (ret)
> + dev_err(pas->dev, "failed to shutdown secondary: %d\n", ret);
> +
> + qcom_pas_unmap_carveout(rproc, pas->secondary_mem_phys,
> + pas->secondary_mem_size);
> + }
> +
> + if (pas->secondary_dtb_pas_id) {
> + ret = qcom_pas_shutdown(pas->secondary_dtb_pas_id);
> + if (ret)
> + dev_err(pas->dev,
> + "failed to shutdown secondary dtb: %d\n", ret);
> +
> + qcom_pas_unmap_carveout(rproc, pas->secondary_dtb_mem_phys,
> + pas->secondary_dtb_mem_size);
> + }
> +
> ret = qcom_pas_shutdown(pas->pas_id);
> if (ret && pas->decrypt_shutdown)
> - ret = qcom_pas_shutdown_poll_decrypt(pas);
> + ret = qcom_pas_shutdown_poll_decrypt(pas->pas_id);
>
> if (ret)
> dev_err(pas->dev, "failed to shutdown: %d\n", ret);
[Severity: Medium]
Won't `ret = qcom_pas_shutdown(pas->pas_id)` overwrite any error returned
when shutting down pas->secondary_pas_id or pas->secondary_dtb_pas_id?
If secondary PAS shutdown fails in TrustZone while the primary PAS shutdown
succeeds, qcom_pas_stop() returns 0 to rproc_stop(). During crash recovery
in rproc_boot_recovery(), a zero return from rproc_stop() lets execution
proceed to rproc->ops->coredump() while the secondary memory region is
still locked by TrustZone, whereas pas->dtb_pas_id below uses a separate
variable to preserve earlier shutdown errors.
--
Sashiko AI review · https://sashiko.dev/#/patchset/20261118-oob-support-glymur-v3-0-2cbdfe208d56@oss.qualcomm.com?part=2
next prev parent reply other threads:[~2026-11-18 15:56 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-18 15:36 [PATCH v3 0/4] Add Glymur OOBMSS support Anvesh Jain P
2026-11-18 15:36 ` [PATCH v3 1/4] dt-bindings: remoteproc: qcom: Add Glymur OOBMSS PAS Anvesh Jain P
2026-11-18 15:36 ` [PATCH v3 2/4] remoteproc: qcom: pas: Support secondary images Anvesh Jain P
2026-11-18 15:56 ` sashiko-bot [this message]
2026-11-18 15:36 ` [PATCH v3 3/4] remoteproc: qcom: pas: Add coredump support for secondary processors Anvesh Jain P
2026-11-18 15:36 ` [PATCH v3 4/4] remoteproc: qcom: pas: Add Glymur OOBMSS PAS parameters Anvesh Jain P
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=sashiko-outbox-221390@kernel.org \
--to=sashiko-bot@kernel.org \
--cc=anvesh.p@oss.qualcomm.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=robh@kernel.org \
--cc=sashiko-reviews@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).