lkml.org 
[lkml]   [2010]   [Sep]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 1/1] MEDIA: ere_ir, fix NULL dereference
Date
When 'dev' allocation fails in ene_probe we jump to error label where
we dereference the 'dev'. Fix it by jumping few lines below.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Maxim Levitsky <maximlevitsky@gmail.com>
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
---
drivers/media/IR/ene_ir.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/IR/ene_ir.c b/drivers/media/IR/ene_ir.c
index 5447750..b475030 100644
--- a/drivers/media/IR/ene_ir.c
+++ b/drivers/media/IR/ene_ir.c
@@ -785,7 +785,7 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id)
dev = kzalloc(sizeof(struct ene_device), GFP_KERNEL);

if (!input_dev || !ir_props || !dev)
- goto error;
+ goto error1;

/* validate resources */
error = -ENODEV;
@@ -899,7 +899,7 @@ error:
free_irq(dev->irq, dev);
if (dev->hw_io)
release_region(dev->hw_io, ENE_MAX_IO);
-
+error1:
input_free_device(input_dev);
kfree(ir_props);
kfree(dev);
--
1.7.2.2



\
 
 \ /
  Last update: 2010-09-04 14:27    [W:0.024 / U:0.284 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site