diff mbox

[RESEND] Input: tegra-kbc - correct call to input_free_device

Message ID 1313052569.2139.1.camel@phoenix (mailing list archive)
State New, archived
Headers show

Commit Message

axel lin Aug. 11, 2011, 8:49 a.m. UTC
If kzalloc for kbc fails, then we have NULL pointer dereference while
calling input_free_device(kbc->idev) in the error handling.
So it is safer to always use the original name, input_dev.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
 drivers/input/keyboard/tegra-kbc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Comments

Dmitry Torokhov Aug. 11, 2011, 4:51 p.m. UTC | #1
On Thu, Aug 11, 2011 at 09:42:54AM -0700, Stephen Warren wrote:
> Axel Lin wrote at Thursday, August 11, 2011 2:49 AM:
> > If kzalloc for kbc fails, then we have NULL pointer dereference while
> > calling input_free_device(kbc->idev) in the error handling.
> > So it is safer to always use the original name, input_dev.
> > 
> > Signed-off-by: Axel Lin <axel.lin@gmail.com>
> 
> Reviewed-by: Stephen Warren <swarren@nvidia.com>

Gah, sorry, already pushed into my public branch so won't be able so
add your reviewed-by...
Stephen Warren Aug. 11, 2011, 5:14 p.m. UTC | #2
Dmitry Torokhov wrote at Thursday, August 11, 2011 10:52 AM:
> On Thu, Aug 11, 2011 at 09:42:54AM -0700, Stephen Warren wrote:
> > Axel Lin wrote at Thursday, August 11, 2011 2:49 AM:
> > > If kzalloc for kbc fails, then we have NULL pointer dereference while
> > > calling input_free_device(kbc->idev) in the error handling.
> > > So it is safer to always use the original name, input_dev.
> > >
> > > Signed-off-by: Axel Lin <axel.lin@gmail.com>
> >
> > Reviewed-by: Stephen Warren <swarren@nvidia.com>
> 
> Gah, sorry, already pushed into my public branch so won't be able so
> add your reviewed-by...

No worries; you had no reason to expect anyone to review it!
diff mbox

Patch

diff --git a/drivers/input/keyboard/tegra-kbc.c b/drivers/input/keyboard/tegra-kbc.c
index 2b3b73e..8e40f2b 100644
--- a/drivers/input/keyboard/tegra-kbc.c
+++ b/drivers/input/keyboard/tegra-kbc.c
@@ -701,7 +701,7 @@  err_iounmap:
 err_free_mem_region:
 	release_mem_region(res->start, resource_size(res));
 err_free_mem:
-	input_free_device(kbc->idev);
+	input_free_device(input_dev);
 	kfree(kbc);
 
 	return err;