* [patch] input: error handling bug in lm8323_probe()
@ 2010-06-10 7:54 Dan Carpenter
2010-06-29 7:07 ` Dmitry Torokhov
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2010-06-10 7:54 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Wolfram Sang, Richard Purdie, Mark Brown, linux-input,
kernel-janitors
We reuse the "i" variable later on so if we goto fail3 or fail4 then "i"
will be set to the wrong thing and cause a crash.
Signed-off-by: Dan Carpenter <error27@gmail.com>
diff --git a/drivers/input/keyboard/lm8323.c b/drivers/input/keyboard/lm8323.c
index 40b032f..f7c2a16 100644
--- a/drivers/input/keyboard/lm8323.c
+++ b/drivers/input/keyboard/lm8323.c
@@ -642,6 +642,7 @@ static int __devinit lm8323_probe(struct i2c_client *client,
struct lm8323_platform_data *pdata = client->dev.platform_data;
struct input_dev *idev;
struct lm8323_chip *lm;
+ int pwm;
int i, err;
unsigned long tmo;
u8 data[2];
@@ -710,8 +711,9 @@ static int __devinit lm8323_probe(struct i2c_client *client,
goto fail1;
}
- for (i = 0; i < LM8323_NUM_PWMS; i++) {
- err = init_pwm(lm, i + 1, &client->dev, pdata->pwm_names[i]);
+ for (pwm = 0; pwm < LM8323_NUM_PWMS; pwm++) {
+ err = init_pwm(lm, pwm + 1, &client->dev,
+ pdata->pwm_names[pwm]);
if (err < 0)
goto fail2;
}
@@ -764,9 +766,9 @@ fail4:
fail3:
device_remove_file(&client->dev, &dev_attr_disable_kp);
fail2:
- while (--i >= 0)
- if (lm->pwm[i].enabled)
- led_classdev_unregister(&lm->pwm[i].cdev);
+ while (--pwm >= 0)
+ if (lm->pwm[pwm].enabled)
+ led_classdev_unregister(&lm->pwm[pwm].cdev);
fail1:
input_free_device(idev);
kfree(lm);
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [patch] input: error handling bug in lm8323_probe()
2010-06-10 7:54 [patch] input: error handling bug in lm8323_probe() Dan Carpenter
@ 2010-06-29 7:07 ` Dmitry Torokhov
0 siblings, 0 replies; 2+ messages in thread
From: Dmitry Torokhov @ 2010-06-29 7:07 UTC (permalink / raw)
To: Dan Carpenter
Cc: Wolfram Sang, Richard Purdie, Mark Brown, linux-input,
kernel-janitors
On Thu, Jun 10, 2010 at 09:54:31AM +0200, Dan Carpenter wrote:
> We reuse the "i" variable later on so if we goto fail3 or fail4 then "i"
> will be set to the wrong thing and cause a crash.
>
> Signed-off-by: Dan Carpenter <error27@gmail.com>
>
Applied to next, thanks Dan.
--
Dmitry
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-06-29 7:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-10 7:54 [patch] input: error handling bug in lm8323_probe() Dan Carpenter
2010-06-29 7:07 ` Dmitry Torokhov
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).