From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
To: gregkh@linuxfoundation.org
Cc: hemantk@codeaurora.org, bbhatt@codeaurora.org,
linux-arm-msm@vger.kernel.org, jhugo@codeaurora.org,
linux-kernel@vger.kernel.org, loic.poulain@linaro.org,
Dan Carpenter <dan.carpenter@oracle.com>,
Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Subject: [PATCH 28/29] bus: mhi: core: Fix error handling in mhi_register_controller()
Date: Wed, 2 Dec 2020 15:11:58 +0530 [thread overview]
Message-ID: <20201202094159.107075-29-manivannan.sadhasivam@linaro.org> (raw)
In-Reply-To: <20201202094159.107075-1-manivannan.sadhasivam@linaro.org>
From: Dan Carpenter <dan.carpenter@oracle.com>
There are a few problems with the error handling in this function. They
mostly center around the alloc_ordered_workqueue() allocation.
1) If that allocation fails or if the kcalloc() prior to it fails then
it leads to a NULL dereference when we call
destroy_workqueue(mhi_cntrl->hiprio_wq).
2) The error code is not set.
3) The "mhi_cntrl->mhi_cmd" allocation is not freed.
The error handling was slightly confusing and I re-ordered it to be in
the exact mirror/reverse order of how things were allocated. I changed
the label names to say what the goto does instead of describing where
the goto comes from.
Fixes: 8f7039787687 ("bus: mhi: core: Move to using high priority workqueue")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Loic Poulain <loic.poulain@linaro.org>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
---
drivers/bus/mhi/core/init.c | 29 ++++++++++++++---------------
1 file changed, 14 insertions(+), 15 deletions(-)
diff --git a/drivers/bus/mhi/core/init.c b/drivers/bus/mhi/core/init.c
index 96cde9c0034c..f0697f433c2f 100644
--- a/drivers/bus/mhi/core/init.c
+++ b/drivers/bus/mhi/core/init.c
@@ -871,7 +871,7 @@ int mhi_register_controller(struct mhi_controller *mhi_cntrl,
sizeof(*mhi_cntrl->mhi_cmd), GFP_KERNEL);
if (!mhi_cntrl->mhi_cmd) {
ret = -ENOMEM;
- goto error_alloc_cmd;
+ goto err_free_event;
}
INIT_LIST_HEAD(&mhi_cntrl->transition_list);
@@ -886,7 +886,8 @@ int mhi_register_controller(struct mhi_controller *mhi_cntrl,
("mhi_hiprio_wq", WQ_MEM_RECLAIM | WQ_HIGHPRI);
if (!mhi_cntrl->hiprio_wq) {
dev_err(mhi_cntrl->cntrl_dev, "Failed to allocate workqueue\n");
- goto error_alloc_cmd;
+ ret = -ENOMEM;
+ goto err_free_cmd;
}
mhi_cmd = mhi_cntrl->mhi_cmd;
@@ -932,7 +933,7 @@ int mhi_register_controller(struct mhi_controller *mhi_cntrl,
ret = mhi_read_reg(mhi_cntrl, mhi_cntrl->regs,
SOC_HW_VERSION_OFFS, &soc_info);
if (ret)
- goto error_alloc_dev;
+ goto err_destroy_wq;
mhi_cntrl->family_number = (soc_info & SOC_HW_VERSION_FAM_NUM_BMSK) >>
SOC_HW_VERSION_FAM_NUM_SHFT;
@@ -946,7 +947,7 @@ int mhi_register_controller(struct mhi_controller *mhi_cntrl,
mhi_cntrl->index = ida_alloc(&mhi_controller_ida, GFP_KERNEL);
if (mhi_cntrl->index < 0) {
ret = mhi_cntrl->index;
- goto error_ida_alloc;
+ goto err_destroy_wq;
}
/* Register controller with MHI bus */
@@ -954,7 +955,7 @@ int mhi_register_controller(struct mhi_controller *mhi_cntrl,
if (IS_ERR(mhi_dev)) {
dev_err(mhi_cntrl->cntrl_dev, "Failed to allocate MHI device\n");
ret = PTR_ERR(mhi_dev);
- goto error_alloc_dev;
+ goto err_ida_free;
}
mhi_dev->dev_type = MHI_DEVICE_CONTROLLER;
@@ -967,7 +968,7 @@ int mhi_register_controller(struct mhi_controller *mhi_cntrl,
ret = device_add(&mhi_dev->dev);
if (ret)
- goto error_add_dev;
+ goto err_release_dev;
mhi_cntrl->mhi_dev = mhi_dev;
@@ -975,19 +976,17 @@ int mhi_register_controller(struct mhi_controller *mhi_cntrl,
return 0;
-error_add_dev:
+err_release_dev:
put_device(&mhi_dev->dev);
-
-error_alloc_dev:
+err_ida_free:
ida_free(&mhi_controller_ida, mhi_cntrl->index);
-
-error_ida_alloc:
+err_destroy_wq:
+ destroy_workqueue(mhi_cntrl->hiprio_wq);
+err_free_cmd:
kfree(mhi_cntrl->mhi_cmd);
-
-error_alloc_cmd:
- vfree(mhi_cntrl->mhi_chan);
+err_free_event:
kfree(mhi_cntrl->mhi_event);
- destroy_workqueue(mhi_cntrl->hiprio_wq);
+ vfree(mhi_cntrl->mhi_chan);
return ret;
}
--
2.25.1
next prev parent reply other threads:[~2020-12-02 9:45 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-02 9:41 [PATCH 00/29] MHI changes for v5.11 Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 01/29] bus: mhi: Remove auto-start option Manivannan Sadhasivam
2020-12-02 16:00 ` Kalle Valo
2020-12-02 16:27 ` Manivannan Sadhasivam
2020-12-02 16:57 ` Kalle Valo
2020-12-02 17:48 ` Greg KH
2020-12-02 9:41 ` [PATCH 02/29] net: qrtr: Start MHI channels during init Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 03/29] bus: mhi: core: fix potential operator-precedence with BHI macros Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 04/29] bus: mhi: Add MHI PCI support for WWAN modems Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 05/29] bus: mhi: core: Fix null pointer access when parsing MHI configuration Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 06/29] bus: mhi: Fix channel close issue on driver remove Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 07/29] bus: mhi: core: Remove unnecessary counter from mhi_firmware_copy() Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 08/29] bus: mhi: core: Add missing EXPORT_SYMBOL for mhi_get_mhi_state() Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 09/29] bus: mhi: core: Expose mhi_get_exec_env() API for controllers Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 10/29] bus: mhi: core: Remove unused mhi_fw_load_worker() declaration Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 11/29] bus: mhi: core: Rename RDDM download function to use proper words Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 12/29] bus: mhi: core: Skip RDDM download for unknown execution environment Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 13/29] bus: mhi: core: Use appropriate names for firmware load functions Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 14/29] bus: mhi: core: Move to using high priority workqueue Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 15/29] bus: mhi: core: Skip device wake in error or shutdown states Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 16/29] bus: mhi: core: Move to SYS_ERROR regardless of RDDM capability Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 17/29] bus: mhi: core: Prevent sending multiple RDDM entry callbacks Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 18/29] bus: mhi: core: Move to an error state on any firmware load failure Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 19/29] bus: mhi: core: Use appropriate label in firmware load handler API Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 20/29] bus: mhi: core: Move to an error state on mission mode failure Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 21/29] bus: mhi: core: Check for IRQ availability during registration Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 22/29] bus: mhi: core: Separate system error and power down handling Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 23/29] bus: mhi: core: Mark and maintain device states early on after power down Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 24/29] bus: mhi: core: Remove MHI event ring IRQ handlers when powering down Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 25/29] net: qrtr: Unprepare MHI channels during remove Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 26/29] bus: mhi: core: Indexed MHI controller name Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 27/29] bus: mhi: core: Fix device hierarchy Manivannan Sadhasivam
2020-12-02 9:41 ` Manivannan Sadhasivam [this message]
2020-12-02 9:41 ` [PATCH 29/29] mhi: pci_generic: Fix implicit conversion warning Manivannan Sadhasivam
2020-12-02 16:29 ` [PATCH 00/29] MHI changes for v5.11 Manivannan Sadhasivam
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=20201202094159.107075-29-manivannan.sadhasivam@linaro.org \
--to=manivannan.sadhasivam@linaro.org \
--cc=bbhatt@codeaurora.org \
--cc=dan.carpenter@oracle.com \
--cc=gregkh@linuxfoundation.org \
--cc=hemantk@codeaurora.org \
--cc=jhugo@codeaurora.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=loic.poulain@linaro.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;
as well as URLs for NNTP newsgroup(s).