From: Ferruh Yigit <fery@cypress.com>
To: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>,
ttdrivers@cypress.com,
Javier Martinez Canillas <javier@dowhile0.org>,
linux-input@vger.kernel.org, kernel-janitors@vger.kernel.org,
Ferruh Yigit <fery@cypress.com>
Subject: [PATCH] Input: cyttsp4 - kfree xfer_buf on error path in probe()
Date: Wed, 3 Jul 2013 20:14:52 +0300 [thread overview]
Message-ID: <1372871693-9871-1-git-send-email-fery@cypress.com> (raw)
In-Reply-To: <51D42CD3.2000705@cypress.com>
If probe() fails after cd->xfer_buf allocated, it will not freed.
Added kfree(cd->xfer_buf) with and error label.
Signed-off-by: Ferruh Yigit <fery@cypress.com>
---
drivers/input/touchscreen/cyttsp4_core.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/input/touchscreen/cyttsp4_core.c b/drivers/input/touchscreen/cyttsp4_core.c
index a7987e1..edcf799 100644
--- a/drivers/input/touchscreen/cyttsp4_core.c
+++ b/drivers/input/touchscreen/cyttsp4_core.c
@@ -2049,7 +2049,7 @@ struct cyttsp4 *cyttsp4_probe(const struct cyttsp4_bus_ops *ops,
cd->irq = gpio_to_irq(cd->cpdata->irq_gpio);
if (cd->irq < 0) {
rc = -EINVAL;
- goto error_free_cd;
+ goto error_free_xfer;
}
dev_set_drvdata(dev, cd);
@@ -2117,6 +2117,8 @@ error_request_irq:
if (cd->cpdata->init)
cd->cpdata->init(cd->cpdata, 0, dev);
dev_set_drvdata(dev, NULL);
+error_free_xfer:
+ kfree(cd->xfer_buf);
error_free_cd:
kfree(cd);
error_alloc_data:
--
1.7.9.5
prev parent reply other threads:[~2013-07-03 17:15 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-02 21:44 [patch 3/3] Input: cyttsp4 - leak on error path in probe() Dan Carpenter
2013-07-03 13:12 ` Ferruh Yigit
2013-07-03 13:50 ` Dan Carpenter
2013-07-03 13:53 ` Ferruh Yigit
2013-07-03 17:14 ` Ferruh Yigit [this message]
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=1372871693-9871-1-git-send-email-fery@cypress.com \
--to=fery@cypress.com \
--cc=dan.carpenter@oracle.com \
--cc=dmitry.torokhov@gmail.com \
--cc=javier@dowhile0.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=ttdrivers@cypress.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;
as well as URLs for NNTP newsgroup(s).