From: Jeff Johnson <jeff.johnson@oss.qualcomm.com>
To: Guangshuo Li <lgs201920130244@gmail.com>,
Jeff Johnson <jjohnson@kernel.org>,
Baochen Qiang <baochen.qiang@oss.qualcomm.com>,
linux-wireless@vger.kernel.org, ath11k@lists.infradead.org,
linux-kernel@vger.kernel.org, ath12k@lists.infradead.org
Subject: Re: [PATCH v3 1/2] wifi: ath11k: release QMI handle on late init failures
Date: Thu, 23 Jul 2026 18:02:10 -0700 [thread overview]
Message-ID: <1c554956-4b33-4b29-bc65-ae6dcbaa124d@oss.qualcomm.com> (raw)
In-Reply-To: <20260718074026.3085688-2-lgs201920130244@gmail.com>
On 7/18/2026 12:40 AM, Guangshuo Li wrote:
(dropping obsolete @quicinc.com and @codeaurora.org e-mail addresses)
> ath11k_qmi_init_service() initializes the QMI handle before allocating
> the QMI event workqueue and registering the service lookup.
>
> If either of these later initialization steps fails, the function
> returns without releasing the initialized QMI handle, leaking its
> resources.
>
> Release the QMI handle on the late failure paths.
>
> Fixes: d5c65159f289 ("ath11k: driver for Qualcomm IEEE 802.11ax devices")
> Signed-off-by: Guangshuo Li <lgs201920130244@gmail.com>
> ---
> drivers/net/wireless/ath/ath11k/qmi.c | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath11k/qmi.c b/drivers/net/wireless/ath/ath11k/qmi.c
> index 410a7ee076a0..6e3f82169d24 100644
> --- a/drivers/net/wireless/ath/ath11k/qmi.c
> +++ b/drivers/net/wireless/ath/ath11k/qmi.c
> @@ -3329,7 +3329,8 @@ int ath11k_qmi_init_service(struct ath11k_base *ab)
> ab->qmi.event_wq = alloc_ordered_workqueue("ath11k_qmi_driver_event", 0);
> if (!ab->qmi.event_wq) {
> ath11k_err(ab, "failed to allocate workqueue\n");
> - return -EFAULT;
> + ret = -EFAULT;
> + goto err_release_qmi_handle;
> }
>
> INIT_LIST_HEAD(&ab->qmi.event_list);
> @@ -3342,9 +3343,14 @@ int ath11k_qmi_init_service(struct ath11k_base *ab)
> if (ret < 0) {
> ath11k_warn(ab, "failed to add qmi lookup: %d\n", ret);
> destroy_workqueue(ab->qmi.event_wq);
Since you are adding cleanup labels, it would be more idiomatic to have a
separate err_destroy_workqueue: label to perform this cleanup
> - return ret;
> + goto err_release_qmi_handle;
> }
>
> + return ret;
> +
so here have
err_destroy_workqueue:
destroy_workqueue(ab->qmi.event_wq);
> +err_release_qmi_handle:
> + qmi_handle_release(&ab->qmi.handle);
> +
> return ret;
> }
>
same comment applies to ath12k
next prev parent reply other threads:[~2026-07-24 1:02 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-18 7:40 [PATCH v3 0/2] wifi: ath11k/ath12k: release QMI handles " Guangshuo Li
2026-07-18 7:40 ` [PATCH v3 1/2] wifi: ath11k: release QMI handle " Guangshuo Li
2026-07-24 1:02 ` Jeff Johnson [this message]
2026-07-18 7:40 ` [PATCH v3 2/2] wifi: ath12k: " Guangshuo Li
2026-07-20 2:20 ` [PATCH v3 0/2] wifi: ath11k/ath12k: release QMI handles " Baochen Qiang
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=1c554956-4b33-4b29-bc65-ae6dcbaa124d@oss.qualcomm.com \
--to=jeff.johnson@oss.qualcomm.com \
--cc=ath11k@lists.infradead.org \
--cc=ath12k@lists.infradead.org \
--cc=baochen.qiang@oss.qualcomm.com \
--cc=jjohnson@kernel.org \
--cc=lgs201920130244@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
/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®