lkml.org 
[lkml]   [2010]   [Mar]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Date
Subject[PATCH 06/24] input/keyboard: fix dangling pointers
Fix I2C-drivers which missed setting clientdata to NULL before freeing the
structure it points to. Also fix drivers which do this _after_ the structure
was freed already.

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---

Found using coccinelle, then reviewed. Full patchset is available via
kernel-janitors, linux-i2c, and LKML.
---
drivers/input/keyboard/lm8323.c | 2 ++
drivers/input/keyboard/qt2160.c | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/input/keyboard/lm8323.c b/drivers/input/keyboard/lm8323.c
index 574eda2..2b8bf05 100644
--- a/drivers/input/keyboard/lm8323.c
+++ b/drivers/input/keyboard/lm8323.c
@@ -768,6 +768,7 @@ fail2:
led_classdev_unregister(&lm->pwm[i].cdev);
fail1:
input_free_device(idev);
+ i2c_set_clientdata(client, NULL);
kfree(lm);
return err;
}
@@ -789,6 +790,7 @@ static int __devexit lm8323_remove(struct i2c_client *client)
if (lm->pwm[i].enabled)
led_classdev_unregister(&lm->pwm[i].cdev);

+ i2c_set_clientdata(client, NULL);
kfree(lm);

return 0;
diff --git a/drivers/input/keyboard/qt2160.c b/drivers/input/keyboard/qt2160.c
index 31f3008..43db5e9 100644
--- a/drivers/input/keyboard/qt2160.c
+++ b/drivers/input/keyboard/qt2160.c
@@ -356,9 +356,9 @@ static int __devexit qt2160_remove(struct i2c_client *client)
cancel_delayed_work_sync(&qt2160->dwork);

input_unregister_device(qt2160->input);
+ i2c_set_clientdata(client, NULL);
kfree(qt2160);

- i2c_set_clientdata(client, NULL);
return 0;
}

--
1.7.0


\
 
 \ /
  Last update: 2010-03-20 15:21    [W:0.157 / U:30.796 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site