From: Pan Xinhui <xinhuix.pan@intel.com>
To: linux-kernel@vger.kernel.org
Cc: dmitry.torokhov@gmail.com, nick.dyer@itdev.co.uk,
miletus@chromium.org, bleung@chromium.org, djkurtz@chromium.org,
mnipxh@gmail.com, yanmin_zhang@linux.intel.com
Subject: [PATCH] atmel: fix an error handle in mxt_probe
Date: Wed, 22 Apr 2015 18:46:58 +0800 [thread overview]
Message-ID: <55377C22.9040309@intel.com> (raw)
mxt_probe() may fail at last step, and the queue_work scheduled by request_firmware_nowait
may run later and then access some data which is freed.
To handle this error, add one mutex_lock to cover such case. It may cause module load delay only when the probe fails.
here is the detail.
module load: worker_thread:
mxt_probe -> mxt_initialize -> request_firmware_nowait (schedule_work)
|
sysfs_create_group (fails) mxt_config_cb -> mxt_configure_objects (may access data freed)
|
err_free_object: some cleanup work, like free(data).
Signed-off-by: xinhuix.pan <xinhuix.pan@intel.com>
---
drivers/input/touchscreen/atmel_mxt_ts.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index 2875ddf..af057c0 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -1978,10 +1978,19 @@ err_free_mem:
static int mxt_configure_objects(struct mxt_data *data,
const struct firmware *cfg);
+static DEFINE_MUTEX(err_probe_lock);
+static int err_probe;
+
static void mxt_config_cb(const struct firmware *cfg, void *ctx)
{
+ mutex_lock(&err_probe_lock);
+ if (err_probe) {
+ mutex_unlock(&err_probe_lock);
+ return;
+ }
mxt_configure_objects(ctx, cfg);
release_firmware(cfg);
+ mutex_unlock(&err_probe_lock);
}
static int mxt_initialize(struct mxt_data *data)
@@ -2423,6 +2432,8 @@ static int mxt_probe(struct i2c_client *client, const struct i2c_device_id *id)
const struct mxt_platform_data *pdata;
int error;
+ err_probe = 0;
+
pdata = dev_get_platdata(&client->dev);
if (!pdata) {
pdata = mxt_parse_dt(client);
@@ -2472,6 +2483,9 @@ static int mxt_probe(struct i2c_client *client, const struct i2c_device_id *id)
return 0;
err_free_object:
+ mutex_lock(&err_probe_lock);
+ err_probe = -1;
+ mutex_unlock(&err_probe_lock);
mxt_free_input_device(data);
mxt_free_object_table(data);
err_free_irq:
--
1.9.1
next reply other threads:[~2015-04-21 10:48 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-22 10:46 Pan Xinhui [this message]
2015-05-13 17:41 ` [PATCH] atmel: fix an error handle in mxt_probe Dmitry Torokhov
2015-05-15 2:42 ` Pan Xinhui
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=55377C22.9040309@intel.com \
--to=xinhuix.pan@intel.com \
--cc=bleung@chromium.org \
--cc=djkurtz@chromium.org \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=miletus@chromium.org \
--cc=mnipxh@gmail.com \
--cc=nick.dyer@itdev.co.uk \
--cc=yanmin_zhang@linux.intel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.