* [patch] generic-adc-battery: forever loop in gab_remove()
@ 2013-02-14 7:26 Dan Carpenter
2013-02-14 8:36 ` anish singh
2013-02-16 21:27 ` Anton Vorontsov
0 siblings, 2 replies; 4+ messages in thread
From: Dan Carpenter @ 2013-02-14 7:26 UTC (permalink / raw)
To: Anton Vorontsov; +Cc: David Woodhouse, linux-kernel, kernel-janitors
There is a forever loop calling iio_channel_release() because the
"chan < " part of the "chan < ARRAY_SIZE()" is missing. This is in both
the error handling on probe and also in the remove function.
The other thing is that it's possible for some of the elements of the
adc_bat->channel[chan] array to be an ERR_PTR(). I've changed them to
be NULL instead. We're still not allowed to pass NULLs to
iio_channel_release() so I've added a check.
Finally, I removed an unused "chan = ARRAY_SIZE(gab_chan_name);"
statement as a small cleanup.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/power/generic-adc-battery.c b/drivers/power/generic-adc-battery.c
index 42733c4..8cb5d7f 100644
--- a/drivers/power/generic-adc-battery.c
+++ b/drivers/power/generic-adc-battery.c
@@ -263,9 +263,6 @@ static int gab_probe(struct platform_device *pdev)
psy->external_power_changed = gab_ext_power_changed;
adc_bat->pdata = pdata;
- /* calculate the total number of channels */
- chan = ARRAY_SIZE(gab_chan_name);
-
/*
* copying the static properties and allocating extra memory for holding
* the extra configurable properties received from platform data.
@@ -291,6 +288,7 @@ static int gab_probe(struct platform_device *pdev)
gab_chan_name[chan]);
if (IS_ERR(adc_bat->channel[chan])) {
ret = PTR_ERR(adc_bat->channel[chan]);
+ adc_bat->channel[chan] = NULL;
} else {
/* copying properties for supported channels only */
memcpy(properties + sizeof(*(psy->properties)) * index,
@@ -344,8 +342,10 @@ err_gpio:
gpio_req_fail:
power_supply_unregister(psy);
err_reg_fail:
- for (chan = 0; ARRAY_SIZE(gab_chan_name); chan++)
- iio_channel_release(adc_bat->channel[chan]);
+ for (chan = 0; chan < ARRAY_SIZE(gab_chan_name); chan++) {
+ if (adc_bat->channel[chan])
+ iio_channel_release(adc_bat->channel[chan]);
+ }
second_mem_fail:
kfree(psy->properties);
first_mem_fail:
@@ -365,8 +365,10 @@ static int gab_remove(struct platform_device *pdev)
gpio_free(pdata->gpio_charge_finished);
}
- for (chan = 0; ARRAY_SIZE(gab_chan_name); chan++)
- iio_channel_release(adc_bat->channel[chan]);
+ for (chan = 0; chan < ARRAY_SIZE(gab_chan_name); chan++) {
+ if (adc_bat->channel[chan])
+ iio_channel_release(adc_bat->channel[chan]);
+ }
kfree(adc_bat->psy.properties);
cancel_delayed_work(&adc_bat->bat_work);
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [patch] generic-adc-battery: forever loop in gab_remove()
2013-02-14 7:26 [patch] generic-adc-battery: forever loop in gab_remove() Dan Carpenter
@ 2013-02-14 8:36 ` anish singh
2013-02-14 8:37 ` anish singh
2013-02-16 21:27 ` Anton Vorontsov
1 sibling, 1 reply; 4+ messages in thread
From: anish singh @ 2013-02-14 8:36 UTC (permalink / raw)
To: Dan Carpenter
Cc: Anton Vorontsov, David Woodhouse, linux-kernel, kernel-janitors
On Thu, Feb 14, 2013 at 12:56 PM, Dan Carpenter
<dan.carpenter@oracle.com> wrote:
> There is a forever loop calling iio_channel_release() because the
> "chan < " part of the "chan < ARRAY_SIZE()" is missing. This is in both
> the error handling on probe and also in the remove function.
>
> The other thing is that it's possible for some of the elements of the
> adc_bat->channel[chan] array to be an ERR_PTR(). I've changed them to
> be NULL instead. We're still not allowed to pass NULLs to
> iio_channel_release() so I've added a check.
>
> Finally, I removed an unused "chan = ARRAY_SIZE(gab_chan_name);"
> statement as a small cleanup.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/drivers/power/generic-adc-battery.c b/drivers/power/generic-adc-battery.c
> index 42733c4..8cb5d7f 100644
> --- a/drivers/power/generic-adc-battery.c
> +++ b/drivers/power/generic-adc-battery.c
> @@ -263,9 +263,6 @@ static int gab_probe(struct platform_device *pdev)
> psy->external_power_changed = gab_ext_power_changed;
> adc_bat->pdata = pdata;
>
> - /* calculate the total number of channels */
> - chan = ARRAY_SIZE(gab_chan_name);
> -
> /*
> * copying the static properties and allocating extra memory for holding
> * the extra configurable properties received from platform data.
> @@ -291,6 +288,7 @@ static int gab_probe(struct platform_device *pdev)
> gab_chan_name[chan]);
> if (IS_ERR(adc_bat->channel[chan])) {
> ret = PTR_ERR(adc_bat->channel[chan]);
> + adc_bat->channel[chan] = NULL;
> } else {
> /* copying properties for supported channels only */
> memcpy(properties + sizeof(*(psy->properties)) * index,
> @@ -344,8 +342,10 @@ err_gpio:
> gpio_req_fail:
> power_supply_unregister(psy);
> err_reg_fail:
> - for (chan = 0; ARRAY_SIZE(gab_chan_name); chan++)
> - iio_channel_release(adc_bat->channel[chan]);
> + for (chan = 0; chan < ARRAY_SIZE(gab_chan_name); chan++) {
> + if (adc_bat->channel[chan])
> + iio_channel_release(adc_bat->channel[chan]);
> + }
> second_mem_fail:
> kfree(psy->properties);
> first_mem_fail:
> @@ -365,8 +365,10 @@ static int gab_remove(struct platform_device *pdev)
> gpio_free(pdata->gpio_charge_finished);
> }
>
> - for (chan = 0; ARRAY_SIZE(gab_chan_name); chan++)
> - iio_channel_release(adc_bat->channel[chan]);
> + for (chan = 0; chan < ARRAY_SIZE(gab_chan_name); chan++) {
> + if (adc_bat->channel[chan])
> + iio_channel_release(adc_bat->channel[chan]);
> + }
>
> kfree(adc_bat->psy.properties);
> cancel_delayed_work(&adc_bat->bat_work);
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [patch] generic-adc-battery: forever loop in gab_remove()
2013-02-14 8:36 ` anish singh
@ 2013-02-14 8:37 ` anish singh
0 siblings, 0 replies; 4+ messages in thread
From: anish singh @ 2013-02-14 8:37 UTC (permalink / raw)
To: Dan Carpenter
Cc: Anton Vorontsov, David Woodhouse, linux-kernel, kernel-janitors
On Thu, Feb 14, 2013 at 2:06 PM, anish singh
<anish198519851985@gmail.com> wrote:
> On Thu, Feb 14, 2013 at 12:56 PM, Dan Carpenter
> <dan.carpenter@oracle.com> wrote:
>> There is a forever loop calling iio_channel_release() because the
>> "chan < " part of the "chan < ARRAY_SIZE()" is missing. This is in both
>> the error handling on probe and also in the remove function.
>>
>> The other thing is that it's possible for some of the elements of the
>> adc_bat->channel[chan] array to be an ERR_PTR(). I've changed them to
>> be NULL instead. We're still not allowed to pass NULLs to
>> iio_channel_release() so I've added a check.
>>
>> Finally, I removed an unused "chan = ARRAY_SIZE(gab_chan_name);"
>> statement as a small cleanup.
>>
>> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
I think this will be picked by Anton.
>
>>
>> diff --git a/drivers/power/generic-adc-battery.c b/drivers/power/generic-adc-battery.c
>> index 42733c4..8cb5d7f 100644
>> --- a/drivers/power/generic-adc-battery.c
>> +++ b/drivers/power/generic-adc-battery.c
>> @@ -263,9 +263,6 @@ static int gab_probe(struct platform_device *pdev)
>> psy->external_power_changed = gab_ext_power_changed;
>> adc_bat->pdata = pdata;
>>
>> - /* calculate the total number of channels */
>> - chan = ARRAY_SIZE(gab_chan_name);
>> -
>> /*
>> * copying the static properties and allocating extra memory for holding
>> * the extra configurable properties received from platform data.
>> @@ -291,6 +288,7 @@ static int gab_probe(struct platform_device *pdev)
>> gab_chan_name[chan]);
>> if (IS_ERR(adc_bat->channel[chan])) {
>> ret = PTR_ERR(adc_bat->channel[chan]);
>> + adc_bat->channel[chan] = NULL;
>> } else {
>> /* copying properties for supported channels only */
>> memcpy(properties + sizeof(*(psy->properties)) * index,
>> @@ -344,8 +342,10 @@ err_gpio:
>> gpio_req_fail:
>> power_supply_unregister(psy);
>> err_reg_fail:
>> - for (chan = 0; ARRAY_SIZE(gab_chan_name); chan++)
>> - iio_channel_release(adc_bat->channel[chan]);
>> + for (chan = 0; chan < ARRAY_SIZE(gab_chan_name); chan++) {
>> + if (adc_bat->channel[chan])
>> + iio_channel_release(adc_bat->channel[chan]);
>> + }
>> second_mem_fail:
>> kfree(psy->properties);
>> first_mem_fail:
>> @@ -365,8 +365,10 @@ static int gab_remove(struct platform_device *pdev)
>> gpio_free(pdata->gpio_charge_finished);
>> }
>>
>> - for (chan = 0; ARRAY_SIZE(gab_chan_name); chan++)
>> - iio_channel_release(adc_bat->channel[chan]);
>> + for (chan = 0; chan < ARRAY_SIZE(gab_chan_name); chan++) {
>> + if (adc_bat->channel[chan])
>> + iio_channel_release(adc_bat->channel[chan]);
>> + }
>>
>> kfree(adc_bat->psy.properties);
>> cancel_delayed_work(&adc_bat->bat_work);
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>> Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [patch] generic-adc-battery: forever loop in gab_remove()
2013-02-14 7:26 [patch] generic-adc-battery: forever loop in gab_remove() Dan Carpenter
2013-02-14 8:36 ` anish singh
@ 2013-02-16 21:27 ` Anton Vorontsov
1 sibling, 0 replies; 4+ messages in thread
From: Anton Vorontsov @ 2013-02-16 21:27 UTC (permalink / raw)
To: Dan Carpenter; +Cc: David Woodhouse, linux-kernel, kernel-janitors
On Thu, Feb 14, 2013 at 10:26:43AM +0300, Dan Carpenter wrote:
> There is a forever loop calling iio_channel_release() because the
> "chan < " part of the "chan < ARRAY_SIZE()" is missing. This is in both
> the error handling on probe and also in the remove function.
>
> The other thing is that it's possible for some of the elements of the
> adc_bat->channel[chan] array to be an ERR_PTR(). I've changed them to
> be NULL instead. We're still not allowed to pass NULLs to
> iio_channel_release() so I've added a check.
>
> Finally, I removed an unused "chan = ARRAY_SIZE(gab_chan_name);"
> statement as a small cleanup.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Applied, thanks a lot!
Anton
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-02-16 21:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-02-14 7:26 [patch] generic-adc-battery: forever loop in gab_remove() Dan Carpenter
2013-02-14 8:36 ` anish singh
2013-02-14 8:37 ` anish singh
2013-02-16 21:27 ` Anton Vorontsov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®