From: Miaoqian Lin <linmq006@gmail.com>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Florian Fainelli <f.fainelli@gmail.com>,
Broadcom internal kernel review list
<bcm-kernel-feedback-list@broadcom.com>,
Miaoqian Lin <linmq006@gmail.com>, Rob Herring <robh@kernel.org>,
Nicolas Saenz Julienne <nsaenz@kernel.org>,
Eric Anholt <eric@anholt.net>,
linux-input@vger.kernel.org,
linux-rpi-kernel@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH] input: raspberrypi-ts: Fix refcount leak in rpi_ts_probe
Date: Tue, 20 Dec 2022 15:52:43 +0400 [thread overview]
Message-ID: <20221220115246.1522054-1-linmq006@gmail.com> (raw)
rpi_firmware_get() take reference, we need to release it in error paths
as well. Add missing rpi_firmware_put() in the error handling to fix it.
Fixes: 0b9f28fed3f7 ("Input: add official Raspberry Pi's touchscreen driver")
Fixes: 3b8ddff780b7 ("input: raspberrypi-ts: Release firmware handle when not needed")
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
---
drivers/input/touchscreen/raspberrypi-ts.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/drivers/input/touchscreen/raspberrypi-ts.c b/drivers/input/touchscreen/raspberrypi-ts.c
index 5000f5fd9ec3..114237c76378 100644
--- a/drivers/input/touchscreen/raspberrypi-ts.c
+++ b/drivers/input/touchscreen/raspberrypi-ts.c
@@ -140,21 +140,24 @@ static int rpi_ts_probe(struct platform_device *pdev)
return -EPROBE_DEFER;
ts = devm_kzalloc(dev, sizeof(*ts), GFP_KERNEL);
- if (!ts)
- return -ENOMEM;
+ if (!ts) {
+ error = -ENOMEM;
+ goto err_put_fw;
+ }
ts->pdev = pdev;
ts->fw_regs_va = dma_alloc_coherent(dev, PAGE_SIZE, &ts->fw_regs_phys,
GFP_KERNEL);
if (!ts->fw_regs_va) {
dev_err(dev, "failed to dma_alloc_coherent\n");
- return -ENOMEM;
+ error = -ENOMEM;
+ goto err_put_fw;
}
error = devm_add_action_or_reset(dev, rpi_ts_dma_cleanup, ts);
if (error) {
dev_err(dev, "failed to devm_add_action_or_reset, %d\n", error);
- return error;
+ goto err_put_fw;
}
touchbuf = (u32)ts->fw_regs_phys;
@@ -206,6 +209,10 @@ static int rpi_ts_probe(struct platform_device *pdev)
}
return 0;
+
+err_put_fw:
+ rpi_firmware_put(fw);
+ return error;
}
static const struct of_device_id rpi_ts_match[] = {
--
2.25.1
next reply other threads:[~2022-12-20 11:53 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-20 11:52 Miaoqian Lin [this message]
2022-12-20 18:55 ` [PATCH] input: raspberrypi-ts: Fix refcount leak in rpi_ts_probe Dmitry Torokhov
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=20221220115246.1522054-1-linmq006@gmail.com \
--to=linmq006@gmail.com \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=dmitry.torokhov@gmail.com \
--cc=eric@anholt.net \
--cc=f.fainelli@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=nsaenz@kernel.org \
--cc=robh@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;
as well as URLs for NNTP newsgroup(s).