From: Mario Limonciello <mario.limonciello@amd.com>
To: Lizhi Hou <lizhi.hou@amd.com>,
ogabbay@kernel.org, quic_jhugo@quicinc.com,
dri-devel@lists.freedesktop.org,
maciej.falkowski@linux.intel.com
Cc: linux-kernel@vger.kernel.org, max.zhen@amd.com, sonal.santan@amd.com
Subject: Re: [PATCH V1] accel/amdxdna: Fix NULL pointer dereference of mgmt_chann
Date: Fri, 27 Feb 2026 14:11:18 -0600 [thread overview]
Message-ID: <e666947b-30b7-444c-9400-966009373e8c@amd.com> (raw)
In-Reply-To: <20260226213857.3068474-1-lizhi.hou@amd.com>
On 2/26/26 3:38 PM, Lizhi Hou wrote:
> mgmt_chann may be set to NULL if the firmware returns an unexpected
> error in aie2_send_mgmt_msg_wait(). This can later lead to a NULL
> pointer dereference in aie2_hw_stop().
>
> Fix this by introducing a dedicated helper to destroy mgmt_chann
> and by adding proper NULL checks before accessing it.
>
Is this actually going to fix it? It sounds like a concurrency problem, no?
Do you want a mutex in the helper perhaps?
> Fixes: b87f920b9344 ("accel/amdxdna: Support hardware mailbox")
> Signed-off-by: Lizhi Hou <lizhi.hou@amd.com>
> ---
> drivers/accel/amdxdna/aie2_message.c | 21 ++++++++++++++++-----
> drivers/accel/amdxdna/aie2_pci.c | 7 ++-----
> drivers/accel/amdxdna/aie2_pci.h | 1 +
> 3 files changed, 19 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/accel/amdxdna/aie2_message.c b/drivers/accel/amdxdna/aie2_message.c
> index 277a27bce850..22e1a85a7ae0 100644
> --- a/drivers/accel/amdxdna/aie2_message.c
> +++ b/drivers/accel/amdxdna/aie2_message.c
> @@ -40,11 +40,8 @@ static int aie2_send_mgmt_msg_wait(struct amdxdna_dev_hdl *ndev,
> return -ENODEV;
>
> ret = xdna_send_msg_wait(xdna, ndev->mgmt_chann, msg);
> - if (ret == -ETIME) {
> - xdna_mailbox_stop_channel(ndev->mgmt_chann);
> - xdna_mailbox_destroy_channel(ndev->mgmt_chann);
> - ndev->mgmt_chann = NULL;
> - }
> + if (ret == -ETIME)
> + aie2_destroy_mgmt_chann(ndev);
>
> if (!ret && *hdl->status != AIE2_STATUS_SUCCESS) {
> XDNA_ERR(xdna, "command opcode 0x%x failed, status 0x%x",
> @@ -914,6 +911,20 @@ void aie2_msg_init(struct amdxdna_dev_hdl *ndev)
> ndev->exec_msg_ops = &legacy_exec_message_ops;
> }
>
> +void aie2_destroy_mgmt_chann(struct amdxdna_dev_hdl *ndev)
> +{
> + struct amdxdna_dev *xdna = ndev->xdna;
> +
> + drm_WARN_ON(&xdna->ddev, !mutex_is_locked(&xdna->dev_lock));
> +
> + if (!ndev->mgmt_chann)
> + return;
> +
> + xdna_mailbox_stop_channel(ndev->mgmt_chann);
> + xdna_mailbox_destroy_channel(ndev->mgmt_chann);
> + ndev->mgmt_chann = NULL;
> +}
> +
> static inline struct amdxdna_gem_obj *
> aie2_cmdlist_get_cmd_buf(struct amdxdna_sched_job *job)
> {
> diff --git a/drivers/accel/amdxdna/aie2_pci.c b/drivers/accel/amdxdna/aie2_pci.c
> index 85079b6fc5d9..977ce21eaf9f 100644
> --- a/drivers/accel/amdxdna/aie2_pci.c
> +++ b/drivers/accel/amdxdna/aie2_pci.c
> @@ -330,9 +330,7 @@ static void aie2_hw_stop(struct amdxdna_dev *xdna)
>
> aie2_runtime_cfg(ndev, AIE2_RT_CFG_CLK_GATING, NULL);
> aie2_mgmt_fw_fini(ndev);
> - xdna_mailbox_stop_channel(ndev->mgmt_chann);
> - xdna_mailbox_destroy_channel(ndev->mgmt_chann);
> - ndev->mgmt_chann = NULL;
> + aie2_destroy_mgmt_chann(ndev);
> drmm_kfree(&xdna->ddev, ndev->mbox);
> ndev->mbox = NULL;
> aie2_psp_stop(ndev->psp_hdl);
> @@ -441,8 +439,7 @@ static int aie2_hw_start(struct amdxdna_dev *xdna)
> return 0;
>
> destroy_mgmt_chann:
> - xdna_mailbox_stop_channel(ndev->mgmt_chann);
> - xdna_mailbox_destroy_channel(ndev->mgmt_chann);
> + aie2_destroy_mgmt_chann(ndev);
> stop_psp:
> aie2_psp_stop(ndev->psp_hdl);
> fini_smu:
> diff --git a/drivers/accel/amdxdna/aie2_pci.h b/drivers/accel/amdxdna/aie2_pci.h
> index b20a3661078c..e72311c77996 100644
> --- a/drivers/accel/amdxdna/aie2_pci.h
> +++ b/drivers/accel/amdxdna/aie2_pci.h
> @@ -303,6 +303,7 @@ int aie2_get_array_async_error(struct amdxdna_dev_hdl *ndev,
>
> /* aie2_message.c */
> void aie2_msg_init(struct amdxdna_dev_hdl *ndev);
> +void aie2_destroy_mgmt_chann(struct amdxdna_dev_hdl *ndev);
> int aie2_suspend_fw(struct amdxdna_dev_hdl *ndev);
> int aie2_resume_fw(struct amdxdna_dev_hdl *ndev);
> int aie2_set_runtime_cfg(struct amdxdna_dev_hdl *ndev, u32 type, u64 value);
next prev parent reply other threads:[~2026-02-27 20:11 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-26 21:38 Lizhi Hou
2026-02-27 20:11 ` Mario Limonciello [this message]
2026-02-28 3:16 ` Lizhi Hou
2026-03-02 16:57 ` Mario Limonciello
2026-03-02 19:53 ` Lizhi Hou
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=e666947b-30b7-444c-9400-966009373e8c@amd.com \
--to=mario.limonciello@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lizhi.hou@amd.com \
--cc=maciej.falkowski@linux.intel.com \
--cc=max.zhen@amd.com \
--cc=ogabbay@kernel.org \
--cc=quic_jhugo@quicinc.com \
--cc=sonal.santan@amd.com \
/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
all inboxes | Powered by JetHome®