* Re: [PATCH] staging:iio:tsl2563 rewrite probe error handling
2012-03-05 17:15 [PATCH] staging:iio:tsl2563 rewrite probe error handling Grant Grundler
@ 2012-03-05 21:28 ` Benson Leung
2012-03-05 21:55 ` Bryan Freed
` (3 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Benson Leung @ 2012-03-05 21:28 UTC (permalink / raw)
To: Grant Grundler
Cc: Jonathan Cameron, Greg Kroah-Hartman, Bryan Freed, linux-iio,
devel, linux-kernel
Looks good to me.
Reviewed-by: Benson Leung <bleung@chromium.org>
On Mon, Mar 5, 2012 at 9:15 AM, Grant Grundler <grundler@chromium.org> wrote:
>
> tsl2563 probe function has two minor issues with it's error handling
> paths:
> 1) it is silent (did not report errors to dmesg)
> 2) did not return failure code (mixed up use of ret and err)
>
> and two major issues:
> 3) goto fail2 would corrupt a free memory pool ("double free")
> 4) device registration failure did NOT cancel/flush delayed work.
> (and thus dereference a freed data structure later)
>
> The "double free" is subtle and was introduced with this change:
> Author: Jonathan Cameron <jic23@cam.ac.uk>
> Date: Mon Apr 18 12:58:55 2011 +0100
> staging:iio:tsl2563 take advantage of new iio_device_allocate private
> data.
>
> Originally, chip was allocated seperately. Now it's appended to the
> indio_dev by iio_allocate_device(sizeof(*chip)). So we only need one
> kfree call as well (in iio_free_device()).
>
> Signed-off-by: Grant Grundler <grundler@chromium.org>
> ---
> Gory details of tracking this down are here:
> http://crosbug.com/26819
>
> Despite iio_device_registration failing, system can at least now boot.
> Will follow up with a fix to "double register : in_intensity_both_raw"
> error that is included in the bug report.
>
> drivers/staging/iio/light/tsl2563.c | 39
> +++++++++++++++++++++++-----------
> 1 files changed, 26 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/staging/iio/light/tsl2563.c
> b/drivers/staging/iio/light/tsl2563.c
> index 7e984bc..bf6498b 100644
> --- a/drivers/staging/iio/light/tsl2563.c
> +++ b/drivers/staging/iio/light/tsl2563.c
> @@ -705,7 +705,6 @@ static int __devinit tsl2563_probe(struct i2c_client
> *client,
> struct tsl2563_chip *chip;
> struct tsl2563_platform_data *pdata = client->dev.platform_data;
> int err = 0;
> - int ret;
> u8 id = 0;
>
> indio_dev = iio_allocate_device(sizeof(*chip));
> @@ -719,13 +718,15 @@ static int __devinit tsl2563_probe(struct i2c_client
> *client,
>
> err = tsl2563_detect(chip);
> if (err) {
> - dev_err(&client->dev, "device not found, error %d\n",
> -err);
> + dev_err(&client->dev, "detect error %d\n", -err);
> goto fail1;
> }
>
> err = tsl2563_read_id(chip, &id);
> - if (err)
> + if (err) {
> + dev_err(&client->dev, "read id error %d\n", -err);
> goto fail1;
> + }
>
> mutex_init(&chip->lock);
>
> @@ -748,40 +749,52 @@ static int __devinit tsl2563_probe(struct i2c_client
> *client,
> indio_dev->num_channels = ARRAY_SIZE(tsl2563_channels);
> indio_dev->dev.parent = &client->dev;
> indio_dev->modes = INDIO_DIRECT_MODE;
> +
> if (client->irq)
> indio_dev->info = &tsl2563_info;
> else
> indio_dev->info = &tsl2563_info_no_irq;
> +
> if (client->irq) {
> - ret = request_threaded_irq(client->irq,
> + err = request_threaded_irq(client->irq,
> NULL,
> &tsl2563_event_handler,
> IRQF_TRIGGER_RISING |
> IRQF_ONESHOT,
> "tsl2563_event",
> indio_dev);
> - if (ret)
> - goto fail2;
> + if (err) {
> + dev_err(&client->dev, "irq request error %d\n",
> -err);
> + goto fail1;
> + }
> }
> +
> err = tsl2563_configure(chip);
> - if (err)
> - goto fail3;
> + if (err) {
> + dev_err(&client->dev, "configure error %d\n", -err);
> + goto fail2;
> + }
>
> INIT_DELAYED_WORK(&chip->poweroff_work, tsl2563_poweroff_work);
> +
> /* The interrupt cannot yet be enabled so this is fine without lock
> */
> schedule_delayed_work(&chip->poweroff_work, 5 * HZ);
>
> - ret = iio_device_register(indio_dev);
> - if (ret)
> + err = iio_device_register(indio_dev);
> + if (err) {
> + dev_err(&client->dev, "iio registration error %d\n",
> -err);
> goto fail3;
> + }
>
> return 0;
> +
> fail3:
> + cancel_delayed_work(&chip->poweroff_work);
> + flush_scheduled_work();
> +fail2:
> if (client->irq)
> free_irq(client->irq, indio_dev);
> -fail2:
> - iio_free_device(indio_dev);
> fail1:
> - kfree(chip);
> + iio_free_device(indio_dev);
> return err;
> }
>
> --
> 1.7.3.4
>
--
Benson Leung
Software Engineer, Chrom* OS
bleung@chromium.org
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH] staging:iio:tsl2563 rewrite probe error handling
2012-03-05 17:15 [PATCH] staging:iio:tsl2563 rewrite probe error handling Grant Grundler
2012-03-05 21:28 ` Benson Leung
@ 2012-03-05 21:55 ` Bryan Freed
[not found] ` <CAEYUcX0ofOgv+G2aUaqcpEZhJU7UmBpxTZ0ye1FkcWdkHLR0MA@mail.gmail.com>
` (2 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Bryan Freed @ 2012-03-05 21:55 UTC (permalink / raw)
To: Grant Grundler
Cc: Jonathan Cameron, Greg Kroah-Hartman, Benson Leung, linux-iio,
devel, linux-kernel
Looks good to me, too, but couldn't we get rid of one fail state
(fail3) by reversing the order of schedule_delayed_work() and
iio_device_register()?
Reviewed-by: Bryan Freed <bfreed@chromium.org>
bryan.
On Mon, Mar 5, 2012 at 9:15 AM, Grant Grundler <grundler@chromium.org> wrote:
>
> tsl2563 probe function has two minor issues with it's error handling paths:
> 1) it is silent (did not report errors to dmesg)
> 2) did not return failure code (mixed up use of ret and err)
>
> and two major issues:
> 3) goto fail2 would corrupt a free memory pool ("double free")
> 4) device registration failure did NOT cancel/flush delayed work.
> (and thus dereference a freed data structure later)
>
> The "double free" is subtle and was introduced with this change:
> Author: Jonathan Cameron <jic23@cam.ac.uk>
> Date: Mon Apr 18 12:58:55 2011 +0100
> staging:iio:tsl2563 take advantage of new iio_device_allocate private data.
>
> Originally, chip was allocated seperately. Now it's appended to the
> indio_dev by iio_allocate_device(sizeof(*chip)). So we only need one
> kfree call as well (in iio_free_device()).
>
> Signed-off-by: Grant Grundler <grundler@chromium.org>
> ---
> Gory details of tracking this down are here:
> http://crosbug.com/26819
>
> Despite iio_device_registration failing, system can at least now boot.
> Will follow up with a fix to "double register : in_intensity_both_raw"
> error that is included in the bug report.
>
> drivers/staging/iio/light/tsl2563.c | 39 +++++++++++++++++++++++-----------
> 1 files changed, 26 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/staging/iio/light/tsl2563.c b/drivers/staging/iio/light/tsl2563.c
> index 7e984bc..bf6498b 100644
> --- a/drivers/staging/iio/light/tsl2563.c
> +++ b/drivers/staging/iio/light/tsl2563.c
> @@ -705,7 +705,6 @@ static int __devinit tsl2563_probe(struct i2c_client *client,
> struct tsl2563_chip *chip;
> struct tsl2563_platform_data *pdata = client->dev.platform_data;
> int err = 0;
> - int ret;
> u8 id = 0;
>
> indio_dev = iio_allocate_device(sizeof(*chip));
> @@ -719,13 +718,15 @@ static int __devinit tsl2563_probe(struct i2c_client *client,
>
> err = tsl2563_detect(chip);
> if (err) {
> - dev_err(&client->dev, "device not found, error %d\n", -err);
> + dev_err(&client->dev, "detect error %d\n", -err);
> goto fail1;
> }
>
> err = tsl2563_read_id(chip, &id);
> - if (err)
> + if (err) {
> + dev_err(&client->dev, "read id error %d\n", -err);
> goto fail1;
> + }
>
> mutex_init(&chip->lock);
>
> @@ -748,40 +749,52 @@ static int __devinit tsl2563_probe(struct i2c_client *client,
> indio_dev->num_channels = ARRAY_SIZE(tsl2563_channels);
> indio_dev->dev.parent = &client->dev;
> indio_dev->modes = INDIO_DIRECT_MODE;
> +
> if (client->irq)
> indio_dev->info = &tsl2563_info;
> else
> indio_dev->info = &tsl2563_info_no_irq;
> +
> if (client->irq) {
> - ret = request_threaded_irq(client->irq,
> + err = request_threaded_irq(client->irq,
> NULL,
> &tsl2563_event_handler,
> IRQF_TRIGGER_RISING | IRQF_ONESHOT,
> "tsl2563_event",
> indio_dev);
> - if (ret)
> - goto fail2;
> + if (err) {
> + dev_err(&client->dev, "irq request error %d\n", -err);
> + goto fail1;
> + }
> }
> +
> err = tsl2563_configure(chip);
> - if (err)
> - goto fail3;
> + if (err) {
> + dev_err(&client->dev, "configure error %d\n", -err);
> + goto fail2;
> + }
>
> INIT_DELAYED_WORK(&chip->poweroff_work, tsl2563_poweroff_work);
> +
> /* The interrupt cannot yet be enabled so this is fine without lock */
> schedule_delayed_work(&chip->poweroff_work, 5 * HZ);
>
> - ret = iio_device_register(indio_dev);
> - if (ret)
> + err = iio_device_register(indio_dev);
> + if (err) {
> + dev_err(&client->dev, "iio registration error %d\n", -err);
> goto fail3;
> + }
>
> return 0;
> +
> fail3:
> + cancel_delayed_work(&chip->poweroff_work);
> + flush_scheduled_work();
> +fail2:
> if (client->irq)
> free_irq(client->irq, indio_dev);
> -fail2:
> - iio_free_device(indio_dev);
> fail1:
> - kfree(chip);
> + iio_free_device(indio_dev);
> return err;
> }
>
> --
> 1.7.3.4
>
^ permalink raw reply [flat|nested] 8+ messages in thread[parent not found: <CAEYUcX0ofOgv+G2aUaqcpEZhJU7UmBpxTZ0ye1FkcWdkHLR0MA@mail.gmail.com>]
* Re: [PATCH] staging:iio:tsl2563 rewrite probe error handling
[not found] ` <CAEYUcX0ofOgv+G2aUaqcpEZhJU7UmBpxTZ0ye1FkcWdkHLR0MA@mail.gmail.com>
@ 2012-03-05 22:12 ` Grant Grundler
0 siblings, 0 replies; 8+ messages in thread
From: Grant Grundler @ 2012-03-05 22:12 UTC (permalink / raw)
To: Bryan Freed
Cc: Jonathan Cameron, Greg Kroah-Hartman, Benson Leung, linux-iio,
devel, linux-kernel
On Mon, Mar 5, 2012 at 1:53 PM, Bryan Freed <bfreed@chromium.org> wrote:
> Looks good to me, too,
Thanks for reviewing!
> but couldn't we get rid of one fail state (fail3) by
> reversing the order of schedule_delayed_work() and iio_device_register()?
My focus on this patch was to get a driver to load/unload properly and
avoid restructuring bits that can be deferred to later patches.
I had the same thought and considered this. The problem is I don't
understand or have time to investigate the locking that is hinted at
in the comment preceding the call to schedule_delayed_work(). I don't
understand what locking they are referring to since interrupts are in
fact enabled by the time the delayed work function is invoked.
I have to wonder if the comment is left over from when the function
was directly called instead of "delayed work". ie race condition
exists regardless of when we call schedule_delayed_work().
> Reviewed-by: Bryan Freed <bfreed@chromium.org>
Thanks! :)
cheers,
grant
>
> bryan.
>
> On Mon, Mar 5, 2012 at 9:15 AM, Grant Grundler <grundler@chromium.org>
> wrote:
>>
>> tsl2563 probe function has two minor issues with it's error handling
>> paths:
>> 1) it is silent (did not report errors to dmesg)
>> 2) did not return failure code (mixed up use of ret and err)
>>
>> and two major issues:
>> 3) goto fail2 would corrupt a free memory pool ("double free")
>> 4) device registration failure did NOT cancel/flush delayed work.
>> (and thus dereference a freed data structure later)
>>
>> The "double free" is subtle and was introduced with this change:
>> Author: Jonathan Cameron <jic23@cam.ac.uk>
>> Date: Mon Apr 18 12:58:55 2011 +0100
>> staging:iio:tsl2563 take advantage of new iio_device_allocate private
>> data.
>>
>> Originally, chip was allocated seperately. Now it's appended to the
>> indio_dev by iio_allocate_device(sizeof(*chip)). So we only need one
>> kfree call as well (in iio_free_device()).
>>
>> Signed-off-by: Grant Grundler <grundler@chromium.org>
>> ---
>> Gory details of tracking this down are here:
>> http://crosbug.com/26819
>>
>> Despite iio_device_registration failing, system can at least now boot.
>> Will follow up with a fix to "double register : in_intensity_both_raw"
>> error that is included in the bug report.
>>
>> drivers/staging/iio/light/tsl2563.c | 39
>> +++++++++++++++++++++++-----------
>> 1 files changed, 26 insertions(+), 13 deletions(-)
>>
>> diff --git a/drivers/staging/iio/light/tsl2563.c
>> b/drivers/staging/iio/light/tsl2563.c
>> index 7e984bc..bf6498b 100644
>> --- a/drivers/staging/iio/light/tsl2563.c
>> +++ b/drivers/staging/iio/light/tsl2563.c
>> @@ -705,7 +705,6 @@ static int __devinit tsl2563_probe(struct i2c_client
>> *client,
>> struct tsl2563_chip *chip;
>> struct tsl2563_platform_data *pdata = client->dev.platform_data;
>> int err = 0;
>> - int ret;
>> u8 id = 0;
>>
>> indio_dev = iio_allocate_device(sizeof(*chip));
>> @@ -719,13 +718,15 @@ static int __devinit tsl2563_probe(struct i2c_client
>> *client,
>>
>> err = tsl2563_detect(chip);
>> if (err) {
>> - dev_err(&client->dev, "device not found, error %d\n",
>> -err);
>> + dev_err(&client->dev, "detect error %d\n", -err);
>> goto fail1;
>> }
>>
>> err = tsl2563_read_id(chip, &id);
>> - if (err)
>> + if (err) {
>> + dev_err(&client->dev, "read id error %d\n", -err);
>> goto fail1;
>> + }
>>
>> mutex_init(&chip->lock);
>>
>> @@ -748,40 +749,52 @@ static int __devinit tsl2563_probe(struct i2c_client
>> *client,
>> indio_dev->num_channels = ARRAY_SIZE(tsl2563_channels);
>> indio_dev->dev.parent = &client->dev;
>> indio_dev->modes = INDIO_DIRECT_MODE;
>> +
>> if (client->irq)
>> indio_dev->info = &tsl2563_info;
>> else
>> indio_dev->info = &tsl2563_info_no_irq;
>> +
>> if (client->irq) {
>> - ret = request_threaded_irq(client->irq,
>> + err = request_threaded_irq(client->irq,
>> NULL,
>> &tsl2563_event_handler,
>> IRQF_TRIGGER_RISING |
>> IRQF_ONESHOT,
>> "tsl2563_event",
>> indio_dev);
>> - if (ret)
>> - goto fail2;
>> + if (err) {
>> + dev_err(&client->dev, "irq request error %d\n",
>> -err);
>> + goto fail1;
>> + }
>> }
>> +
>> err = tsl2563_configure(chip);
>> - if (err)
>> - goto fail3;
>> + if (err) {
>> + dev_err(&client->dev, "configure error %d\n", -err);
>> + goto fail2;
>> + }
>>
>> INIT_DELAYED_WORK(&chip->poweroff_work, tsl2563_poweroff_work);
>> +
>> /* The interrupt cannot yet be enabled so this is fine without lock
>> */
>> schedule_delayed_work(&chip->poweroff_work, 5 * HZ);
>>
>> - ret = iio_device_register(indio_dev);
>> - if (ret)
>> + err = iio_device_register(indio_dev);
>> + if (err) {
>> + dev_err(&client->dev, "iio registration error %d\n",
>> -err);
>> goto fail3;
>> + }
>>
>> return 0;
>> +
>> fail3:
>> + cancel_delayed_work(&chip->poweroff_work);
>> + flush_scheduled_work();
>> +fail2:
>> if (client->irq)
>> free_irq(client->irq, indio_dev);
>> -fail2:
>> - iio_free_device(indio_dev);
>> fail1:
>> - kfree(chip);
>> + iio_free_device(indio_dev);
>> return err;
>> }
>>
>> --
>> 1.7.3.4
>>
>
^ permalink raw reply [flat|nested] 8+ messages in thread
[parent not found: <CANLzEkvKkgRNLCxiAYp+5+PVABrqtQA18MqKYiUEgqA5CG-OhA@mail.gmail.com>]
* Re: [PATCH] staging:iio:tsl2563 rewrite probe error handling
[not found] ` <CANLzEkvKkgRNLCxiAYp+5+PVABrqtQA18MqKYiUEgqA5CG-OhA@mail.gmail.com>
@ 2012-03-05 22:12 ` Grant Grundler
0 siblings, 0 replies; 8+ messages in thread
From: Grant Grundler @ 2012-03-05 22:12 UTC (permalink / raw)
To: Benson Leung
Cc: Jonathan Cameron, Greg Kroah-Hartman, Bryan Freed, linux-iio,
devel, linux-kernel
On Mon, Mar 5, 2012 at 1:27 PM, Benson Leung <bleung@chromium.org> wrote:
> Looks good to me.
Thanks Benson!
cheers,
grant
>
> Reviewed-by: Benson Leung <bleung@chromium.org>
>
> On Mon, Mar 5, 2012 at 9:15 AM, Grant Grundler <grundler@chromium.org>
> wrote:
>>
>> tsl2563 probe function has two minor issues with it's error handling
>> paths:
>> 1) it is silent (did not report errors to dmesg)
>> 2) did not return failure code (mixed up use of ret and err)
>>
>> and two major issues:
>> 3) goto fail2 would corrupt a free memory pool ("double free")
>> 4) device registration failure did NOT cancel/flush delayed work.
>> (and thus dereference a freed data structure later)
>>
>> The "double free" is subtle and was introduced with this change:
>> Author: Jonathan Cameron <jic23@cam.ac.uk>
>> Date: Mon Apr 18 12:58:55 2011 +0100
>> staging:iio:tsl2563 take advantage of new iio_device_allocate private
>> data.
>>
>> Originally, chip was allocated seperately. Now it's appended to the
>> indio_dev by iio_allocate_device(sizeof(*chip)). So we only need one
>> kfree call as well (in iio_free_device()).
>>
>> Signed-off-by: Grant Grundler <grundler@chromium.org>
>> ---
>> Gory details of tracking this down are here:
>> http://crosbug.com/26819
>>
>> Despite iio_device_registration failing, system can at least now boot.
>> Will follow up with a fix to "double register : in_intensity_both_raw"
>> error that is included in the bug report.
>>
>> drivers/staging/iio/light/tsl2563.c | 39
>> +++++++++++++++++++++++-----------
>> 1 files changed, 26 insertions(+), 13 deletions(-)
>>
>> diff --git a/drivers/staging/iio/light/tsl2563.c
>> b/drivers/staging/iio/light/tsl2563.c
>> index 7e984bc..bf6498b 100644
>> --- a/drivers/staging/iio/light/tsl2563.c
>> +++ b/drivers/staging/iio/light/tsl2563.c
>> @@ -705,7 +705,6 @@ static int __devinit tsl2563_probe(struct i2c_client
>> *client,
>> struct tsl2563_chip *chip;
>> struct tsl2563_platform_data *pdata = client->dev.platform_data;
>> int err = 0;
>> - int ret;
>> u8 id = 0;
>>
>> indio_dev = iio_allocate_device(sizeof(*chip));
>> @@ -719,13 +718,15 @@ static int __devinit tsl2563_probe(struct i2c_client
>> *client,
>>
>> err = tsl2563_detect(chip);
>> if (err) {
>> - dev_err(&client->dev, "device not found, error %d\n",
>> -err);
>> + dev_err(&client->dev, "detect error %d\n", -err);
>> goto fail1;
>> }
>>
>> err = tsl2563_read_id(chip, &id);
>> - if (err)
>> + if (err) {
>> + dev_err(&client->dev, "read id error %d\n", -err);
>> goto fail1;
>> + }
>>
>> mutex_init(&chip->lock);
>>
>> @@ -748,40 +749,52 @@ static int __devinit tsl2563_probe(struct i2c_client
>> *client,
>> indio_dev->num_channels = ARRAY_SIZE(tsl2563_channels);
>> indio_dev->dev.parent = &client->dev;
>> indio_dev->modes = INDIO_DIRECT_MODE;
>> +
>> if (client->irq)
>> indio_dev->info = &tsl2563_info;
>> else
>> indio_dev->info = &tsl2563_info_no_irq;
>> +
>> if (client->irq) {
>> - ret = request_threaded_irq(client->irq,
>> + err = request_threaded_irq(client->irq,
>> NULL,
>> &tsl2563_event_handler,
>> IRQF_TRIGGER_RISING |
>> IRQF_ONESHOT,
>> "tsl2563_event",
>> indio_dev);
>> - if (ret)
>> - goto fail2;
>> + if (err) {
>> + dev_err(&client->dev, "irq request error %d\n",
>> -err);
>> + goto fail1;
>> + }
>> }
>> +
>> err = tsl2563_configure(chip);
>> - if (err)
>> - goto fail3;
>> + if (err) {
>> + dev_err(&client->dev, "configure error %d\n", -err);
>> + goto fail2;
>> + }
>>
>> INIT_DELAYED_WORK(&chip->poweroff_work, tsl2563_poweroff_work);
>> +
>> /* The interrupt cannot yet be enabled so this is fine without lock
>> */
>> schedule_delayed_work(&chip->poweroff_work, 5 * HZ);
>>
>> - ret = iio_device_register(indio_dev);
>> - if (ret)
>> + err = iio_device_register(indio_dev);
>> + if (err) {
>> + dev_err(&client->dev, "iio registration error %d\n",
>> -err);
>> goto fail3;
>> + }
>>
>> return 0;
>> +
>> fail3:
>> + cancel_delayed_work(&chip->poweroff_work);
>> + flush_scheduled_work();
>> +fail2:
>> if (client->irq)
>> free_irq(client->irq, indio_dev);
>> -fail2:
>> - iio_free_device(indio_dev);
>> fail1:
>> - kfree(chip);
>> + iio_free_device(indio_dev);
>> return err;
>> }
>>
>> --
>> 1.7.3.4
>>
>
>
>
> --
> Benson Leung
> Software Engineer, Chrom* OS
> bleung@chromium.org
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] staging:iio:tsl2563 rewrite probe error handling
2012-03-05 17:15 [PATCH] staging:iio:tsl2563 rewrite probe error handling Grant Grundler
` (3 preceding siblings ...)
[not found] ` <CANLzEkvKkgRNLCxiAYp+5+PVABrqtQA18MqKYiUEgqA5CG-OhA@mail.gmail.com>
@ 2012-03-07 11:28 ` Jonathan Cameron
2012-03-09 3:51 ` Grant Grundler
4 siblings, 1 reply; 8+ messages in thread
From: Jonathan Cameron @ 2012-03-07 11:28 UTC (permalink / raw)
To: Grant Grundler
Cc: Jonathan Cameron, Greg Kroah-Hartman, Benson Leung, Bryan Freed,
linux-iio, devel, linux-kernel
Fundamentally an excellent patch fixing some real issues, but just
because I'm in that sort of mood I'll be fussy about the fact it is
one patch.
To nitpick, I'd have prefered this to be two patches. First that fixes
the issues and the second that adds the additional output. Actually
should probably have even had a third making the white space changes.
In particular 'device not found' and 'device detect error' are both
valid explanations. Perhaps it's nice to have everything more
consistent but that shouldn't have been in the same patch as some out
and out fixes. Fixes will probably get back ported to stable trees,
error messages won't.
Still,getting the fix in place is the most important thing so if Greg
is willing to pick this up then it has my Ack.
On 03/05/2012 05:15 PM, Grant Grundler wrote:
> tsl2563 probe function has two minor issues with it's error handling paths:
> 1) it is silent (did not report errors to dmesg)
> 2) did not return failure code (mixed up use of ret and err)
>
> and two major issues:
> 3) goto fail2 would corrupt a free memory pool ("double free")
> 4) device registration failure did NOT cancel/flush delayed work.
> (and thus dereference a freed data structure later)
>
> The "double free" is subtle and was introduced with this change:
> Author: Jonathan Cameron <jic23@cam.ac.uk>
> Date: Mon Apr 18 12:58:55 2011 +0100
> staging:iio:tsl2563 take advantage of new iio_device_allocate private data.
oops. Thanks for picking up on this one.
>
> Originally, chip was allocated seperately. Now it's appended to the
> indio_dev by iio_allocate_device(sizeof(*chip)). So we only need one
> kfree call as well (in iio_free_device()).
>
> Signed-off-by: Grant Grundler <grundler@chromium.org>
Acked-by: Jonathan Cameron <jic23@kernel.org>
> ---
> Gory details of tracking this down are here:
> http://crosbug.com/26819
>
> Despite iio_device_registration failing, system can at least now boot.
> Will follow up with a fix to "double register : in_intensity_both_raw"
> error that is included in the bug report.
>
> drivers/staging/iio/light/tsl2563.c | 39 +++++++++++++++++++++++-----------
> 1 files changed, 26 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/staging/iio/light/tsl2563.c b/drivers/staging/iio/light/tsl2563.c
> index 7e984bc..bf6498b 100644
> --- a/drivers/staging/iio/light/tsl2563.c
> +++ b/drivers/staging/iio/light/tsl2563.c
> @@ -705,7 +705,6 @@ static int __devinit tsl2563_probe(struct i2c_client *client,
> struct tsl2563_chip *chip;
> struct tsl2563_platform_data *pdata = client->dev.platform_data;
> int err = 0;
> - int ret;
> u8 id = 0;
>
> indio_dev = iio_allocate_device(sizeof(*chip));
> @@ -719,13 +718,15 @@ static int __devinit tsl2563_probe(struct i2c_client *client,
>
> err = tsl2563_detect(chip);
> if (err) {
> - dev_err(&client->dev, "device not found, error %d\n", -err);
> + dev_err(&client->dev, "detect error %d\n", -err);
> goto fail1;
> }
>
> err = tsl2563_read_id(chip, &id);
> - if (err)
> + if (err) {
> + dev_err(&client->dev, "read id error %d\n", -err);
> goto fail1;
> + }
>
> mutex_init(&chip->lock);
>
> @@ -748,40 +749,52 @@ static int __devinit tsl2563_probe(struct i2c_client *client,
> indio_dev->num_channels = ARRAY_SIZE(tsl2563_channels);
> indio_dev->dev.parent = &client->dev;
> indio_dev->modes = INDIO_DIRECT_MODE;
Certainly no problem with white space here to make the sections of
code more obvious, but it doesn't belong in a patch with bug fixes.
> +
> if (client->irq)
> indio_dev->info = &tsl2563_info;
> else
> indio_dev->info = &tsl2563_info_no_irq;
> +
> if (client->irq) {
> - ret = request_threaded_irq(client->irq,
> + err = request_threaded_irq(client->irq,
> NULL,
> &tsl2563_event_handler,
> IRQF_TRIGGER_RISING | IRQF_ONESHOT,
> "tsl2563_event",
> indio_dev);
> - if (ret)
> - goto fail2;
> + if (err) {
> + dev_err(&client->dev, "irq request error %d\n", -err);
> + goto fail1;
> + }
> }
> +
> err = tsl2563_configure(chip);
> - if (err)
> - goto fail3;
> + if (err) {
> + dev_err(&client->dev, "configure error %d\n", -err);
> + goto fail2;
> + }
>
> INIT_DELAYED_WORK(&chip->poweroff_work, tsl2563_poweroff_work);
> +
> /* The interrupt cannot yet be enabled so this is fine without lock */
> schedule_delayed_work(&chip->poweroff_work, 5 * HZ);
>
> - ret = iio_device_register(indio_dev);
> - if (ret)
> + err = iio_device_register(indio_dev);
> + if (err) {
> + dev_err(&client->dev, "iio registration error %d\n", -err);
> goto fail3;
> + }
>
> return 0;
> +
> fail3:
> + cancel_delayed_work(&chip->poweroff_work);
> + flush_scheduled_work();
> +fail2:
> if (client->irq)
> free_irq(client->irq, indio_dev);
> -fail2:
> - iio_free_device(indio_dev);
> fail1:
> - kfree(chip);
> + iio_free_device(indio_dev);
> return err;
> }
>
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH] staging:iio:tsl2563 rewrite probe error handling
2012-03-07 11:28 ` Jonathan Cameron
@ 2012-03-09 3:51 ` Grant Grundler
2012-03-09 6:23 ` Dan Carpenter
0 siblings, 1 reply; 8+ messages in thread
From: Grant Grundler @ 2012-03-09 3:51 UTC (permalink / raw)
To: Jonathan Cameron
Cc: Jonathan Cameron, Greg Kroah-Hartman, Benson Leung, Bryan Freed,
linux-iio, devel, linux-kernel
Hi Jonathan!
On Wed, Mar 7, 2012 at 3:28 AM, Jonathan Cameron <jic23@kernel.org> wrote:
> Fundamentally an excellent patch fixing some real issues,
Thank you! :)
> but just
> because I'm in that sort of mood I'll be fussy about the fact it is
> one patch.
>
> To nitpick, I'd have prefered this to be two patches. First that fixes
> the issues and the second that adds the additional output. Actually
> should probably have even had a third making the white space changes.
Yup - I see/understand why. I need to improve my git foo and work
habits so it's not hard to play with a series of smaller patches
rather than one patch that does everything to one function.
> In particular 'device not found' and 'device detect error' are both
> valid explanations. Perhaps it's nice to have everything more
> consistent but that shouldn't have been in the same patch as some out
> and out fixes. Fixes will probably get back ported to stable trees,
> error messages won't.
>
> Still,getting the fix in place is the most important thing so if Greg
> is willing to pick this up then it has my Ack.
Thanks!
BTW, the bug(s) I fixed with this patch showed up because 3.2.7 (and
predecessors) didn't have this patch:
Author: Jonathan Cameron <jic23@cam.ac.uk>
Date: Wed Oct 26 17:27:36 2011 +0100
staging:iio:light:tsl2563 both intensity channels have same chan_spec.
Bug has been fixed for some time in the outofstaging tree, but
didn't propogate back to here.
please consider adding this to linux-stable series.
cheers,
grant
>
> On 03/05/2012 05:15 PM, Grant Grundler wrote:
>> tsl2563 probe function has two minor issues with it's error handling paths:
>> 1) it is silent (did not report errors to dmesg)
>> 2) did not return failure code (mixed up use of ret and err)
>>
>> and two major issues:
>> 3) goto fail2 would corrupt a free memory pool ("double free")
>> 4) device registration failure did NOT cancel/flush delayed work.
>> (and thus dereference a freed data structure later)
>>
>> The "double free" is subtle and was introduced with this change:
>> Author: Jonathan Cameron <jic23@cam.ac.uk>
>> Date: Mon Apr 18 12:58:55 2011 +0100
>> staging:iio:tsl2563 take advantage of new iio_device_allocate private data.
> oops. Thanks for picking up on this one.
>>
>> Originally, chip was allocated seperately. Now it's appended to the
>> indio_dev by iio_allocate_device(sizeof(*chip)). So we only need one
>> kfree call as well (in iio_free_device()).
>>
>> Signed-off-by: Grant Grundler <grundler@chromium.org>
> Acked-by: Jonathan Cameron <jic23@kernel.org>
>> ---
>> Gory details of tracking this down are here:
>> http://crosbug.com/26819
>>
>> Despite iio_device_registration failing, system can at least now boot.
>> Will follow up with a fix to "double register : in_intensity_both_raw"
>> error that is included in the bug report.
>>
>> drivers/staging/iio/light/tsl2563.c | 39 +++++++++++++++++++++++-----------
>> 1 files changed, 26 insertions(+), 13 deletions(-)
>>
>> diff --git a/drivers/staging/iio/light/tsl2563.c b/drivers/staging/iio/light/tsl2563.c
>> index 7e984bc..bf6498b 100644
>> --- a/drivers/staging/iio/light/tsl2563.c
>> +++ b/drivers/staging/iio/light/tsl2563.c
>> @@ -705,7 +705,6 @@ static int __devinit tsl2563_probe(struct i2c_client *client,
>> struct tsl2563_chip *chip;
>> struct tsl2563_platform_data *pdata = client->dev.platform_data;
>> int err = 0;
>> - int ret;
>> u8 id = 0;
>>
>> indio_dev = iio_allocate_device(sizeof(*chip));
>> @@ -719,13 +718,15 @@ static int __devinit tsl2563_probe(struct i2c_client *client,
>>
>> err = tsl2563_detect(chip);
>> if (err) {
>> - dev_err(&client->dev, "device not found, error %d\n", -err);
>> + dev_err(&client->dev, "detect error %d\n", -err);
>> goto fail1;
>> }
>>
>> err = tsl2563_read_id(chip, &id);
>> - if (err)
>> + if (err) {
>> + dev_err(&client->dev, "read id error %d\n", -err);
>> goto fail1;
>> + }
>>
>> mutex_init(&chip->lock);
>>
>> @@ -748,40 +749,52 @@ static int __devinit tsl2563_probe(struct i2c_client *client,
>> indio_dev->num_channels = ARRAY_SIZE(tsl2563_channels);
>> indio_dev->dev.parent = &client->dev;
>> indio_dev->modes = INDIO_DIRECT_MODE;
> Certainly no problem with white space here to make the sections of
> code more obvious, but it doesn't belong in a patch with bug fixes.
>> +
>> if (client->irq)
>> indio_dev->info = &tsl2563_info;
>> else
>> indio_dev->info = &tsl2563_info_no_irq;
>> +
>> if (client->irq) {
>> - ret = request_threaded_irq(client->irq,
>> + err = request_threaded_irq(client->irq,
>> NULL,
>> &tsl2563_event_handler,
>> IRQF_TRIGGER_RISING | IRQF_ONESHOT,
>> "tsl2563_event",
>> indio_dev);
>> - if (ret)
>> - goto fail2;
>> + if (err) {
>> + dev_err(&client->dev, "irq request error %d\n", -err);
>> + goto fail1;
>> + }
>> }
>> +
>> err = tsl2563_configure(chip);
>> - if (err)
>> - goto fail3;
>> + if (err) {
>> + dev_err(&client->dev, "configure error %d\n", -err);
>> + goto fail2;
>> + }
>>
>> INIT_DELAYED_WORK(&chip->poweroff_work, tsl2563_poweroff_work);
>> +
>> /* The interrupt cannot yet be enabled so this is fine without lock */
>> schedule_delayed_work(&chip->poweroff_work, 5 * HZ);
>>
>> - ret = iio_device_register(indio_dev);
>> - if (ret)
>> + err = iio_device_register(indio_dev);
>> + if (err) {
>> + dev_err(&client->dev, "iio registration error %d\n", -err);
>> goto fail3;
>> + }
>>
>> return 0;
>> +
>> fail3:
>> + cancel_delayed_work(&chip->poweroff_work);
>> + flush_scheduled_work();
>> +fail2:
>> if (client->irq)
>> free_irq(client->irq, indio_dev);
>> -fail2:
>> - iio_free_device(indio_dev);
>> fail1:
>> - kfree(chip);
>> + iio_free_device(indio_dev);
>> return err;
>> }
>>
>
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH] staging:iio:tsl2563 rewrite probe error handling
2012-03-09 3:51 ` Grant Grundler
@ 2012-03-09 6:23 ` Dan Carpenter
0 siblings, 0 replies; 8+ messages in thread
From: Dan Carpenter @ 2012-03-09 6:23 UTC (permalink / raw)
To: Grant Grundler
Cc: Jonathan Cameron, devel, linux-iio, Greg Kroah-Hartman,
linux-kernel, Bryan Freed, Jonathan Cameron, Benson Leung
[-- Attachment #1: Type: text/plain, Size: 923 bytes --]
On Thu, Mar 08, 2012 at 07:51:07PM -0800, Grant Grundler wrote:
> Hi Jonathan!
>
> On Wed, Mar 7, 2012 at 3:28 AM, Jonathan Cameron <jic23@kernel.org> wrote:
> > Fundamentally an excellent patch fixing some real issues,
>
> Thank you! :)
>
> > but just
> > because I'm in that sort of mood I'll be fussy about the fact it is
> > one patch.
> >
> > To nitpick, I'd have prefered this to be two patches. First that fixes
> > the issues and the second that adds the additional output. Actually
> > should probably have even had a third making the white space changes.
>
> Yup - I see/understand why. I need to improve my git foo and work
> habits so it's not hard to play with a series of smaller patches
> rather than one patch that does everything to one function.
>
If you use git citool then you can just highlight and right click on
the lines you want to merge.
regards,
dan carpenter
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread