From: Dan Carpenter <error27@gmail.com>
To: Maxim Levitsky <maximlevitsky@gmail.com>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>,
linux-media@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [patch] IR: ene_ir: problems in unwinding on probe
Date: Thu, 12 Aug 2010 07:46:11 +0000 [thread overview]
Message-ID: <20100812074611.GI645@bicker> (raw)
There were a couple issues here. If the allocation failed for "dev"
then it would lead to a NULL dereference. If request_irq() or
request_region() failed it would release the irq and the region even
though they were not successfully aquired.
Signed-off-by: Dan Carpenter <error27@gmail.com>
diff --git a/drivers/media/IR/ene_ir.c b/drivers/media/IR/ene_ir.c
index 5447750..8e5e964 100644
--- a/drivers/media/IR/ene_ir.c
+++ b/drivers/media/IR/ene_ir.c
@@ -781,21 +781,24 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id)
/* allocate memory */
input_dev = input_allocate_device();
+ if (!input_dev)
+ goto err_out;
ir_props = kzalloc(sizeof(struct ir_dev_props), GFP_KERNEL);
+ if (!ir_props)
+ goto err_input_dev;
dev = kzalloc(sizeof(struct ene_device), GFP_KERNEL);
-
- if (!input_dev || !ir_props || !dev)
- goto error;
+ if (!dev)
+ goto err_ir_props;
/* validate resources */
error = -ENODEV;
if (!pnp_port_valid(pnp_dev, 0) ||
pnp_port_len(pnp_dev, 0) < ENE_MAX_IO)
- goto error;
+ goto err_dev;
if (!pnp_irq_valid(pnp_dev, 0))
- goto error;
+ goto err_dev;
dev->hw_io = pnp_port_start(pnp_dev, 0);
dev->irq = pnp_irq(pnp_dev, 0);
@@ -804,11 +807,11 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id)
/* claim the resources */
error = -EBUSY;
if (!request_region(dev->hw_io, ENE_MAX_IO, ENE_DRIVER_NAME))
- goto error;
+ goto err_dev;
if (request_irq(dev->irq, ene_isr,
IRQF_SHARED, ENE_DRIVER_NAME, (void *)dev))
- goto error;
+ goto err_region;
pnp_set_drvdata(pnp_dev, dev);
dev->pnp_dev = pnp_dev;
@@ -816,7 +819,7 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id)
/* detect hardware version and features */
error = ene_hw_detect(dev);
if (error)
- goto error;
+ goto err_irq;
ene_setup_settings(dev);
@@ -889,20 +892,22 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id)
error = -ENODEV;
if (ir_input_register(input_dev, RC_MAP_RC6_MCE, ir_props,
ENE_DRIVER_NAME))
- goto error;
-
+ goto err_irq;
ene_printk(KERN_NOTICE, "driver has been succesfully loaded\n");
return 0;
-error:
- if (dev->irq)
- free_irq(dev->irq, dev);
- if (dev->hw_io)
- release_region(dev->hw_io, ENE_MAX_IO);
- input_free_device(input_dev);
- kfree(ir_props);
+err_irq:
+ free_irq(dev->irq, dev);
+err_region:
+ release_region(dev->hw_io, ENE_MAX_IO);
+err_dev:
kfree(dev);
+err_ir_props:
+ kfree(ir_props);
+err_input_dev:
+ input_free_device(input_dev);
+err_out:
return error;
}
WARNING: multiple messages have this Message-ID (diff)
From: Dan Carpenter <error27@gmail.com>
To: Maxim Levitsky <maximlevitsky@gmail.com>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>,
linux-media@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [patch] IR: ene_ir: problems in unwinding on probe
Date: Thu, 12 Aug 2010 09:46:11 +0200 [thread overview]
Message-ID: <20100812074611.GI645@bicker> (raw)
There were a couple issues here. If the allocation failed for "dev"
then it would lead to a NULL dereference. If request_irq() or
request_region() failed it would release the irq and the region even
though they were not successfully aquired.
Signed-off-by: Dan Carpenter <error27@gmail.com>
diff --git a/drivers/media/IR/ene_ir.c b/drivers/media/IR/ene_ir.c
index 5447750..8e5e964 100644
--- a/drivers/media/IR/ene_ir.c
+++ b/drivers/media/IR/ene_ir.c
@@ -781,21 +781,24 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id)
/* allocate memory */
input_dev = input_allocate_device();
+ if (!input_dev)
+ goto err_out;
ir_props = kzalloc(sizeof(struct ir_dev_props), GFP_KERNEL);
+ if (!ir_props)
+ goto err_input_dev;
dev = kzalloc(sizeof(struct ene_device), GFP_KERNEL);
-
- if (!input_dev || !ir_props || !dev)
- goto error;
+ if (!dev)
+ goto err_ir_props;
/* validate resources */
error = -ENODEV;
if (!pnp_port_valid(pnp_dev, 0) ||
pnp_port_len(pnp_dev, 0) < ENE_MAX_IO)
- goto error;
+ goto err_dev;
if (!pnp_irq_valid(pnp_dev, 0))
- goto error;
+ goto err_dev;
dev->hw_io = pnp_port_start(pnp_dev, 0);
dev->irq = pnp_irq(pnp_dev, 0);
@@ -804,11 +807,11 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id)
/* claim the resources */
error = -EBUSY;
if (!request_region(dev->hw_io, ENE_MAX_IO, ENE_DRIVER_NAME))
- goto error;
+ goto err_dev;
if (request_irq(dev->irq, ene_isr,
IRQF_SHARED, ENE_DRIVER_NAME, (void *)dev))
- goto error;
+ goto err_region;
pnp_set_drvdata(pnp_dev, dev);
dev->pnp_dev = pnp_dev;
@@ -816,7 +819,7 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id)
/* detect hardware version and features */
error = ene_hw_detect(dev);
if (error)
- goto error;
+ goto err_irq;
ene_setup_settings(dev);
@@ -889,20 +892,22 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id)
error = -ENODEV;
if (ir_input_register(input_dev, RC_MAP_RC6_MCE, ir_props,
ENE_DRIVER_NAME))
- goto error;
-
+ goto err_irq;
ene_printk(KERN_NOTICE, "driver has been succesfully loaded\n");
return 0;
-error:
- if (dev->irq)
- free_irq(dev->irq, dev);
- if (dev->hw_io)
- release_region(dev->hw_io, ENE_MAX_IO);
- input_free_device(input_dev);
- kfree(ir_props);
+err_irq:
+ free_irq(dev->irq, dev);
+err_region:
+ release_region(dev->hw_io, ENE_MAX_IO);
+err_dev:
kfree(dev);
+err_ir_props:
+ kfree(ir_props);
+err_input_dev:
+ input_free_device(input_dev);
+err_out:
return error;
}
next reply other threads:[~2010-08-12 7:46 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-12 7:46 Dan Carpenter [this message]
2010-08-12 7:46 ` [patch] IR: ene_ir: problems in unwinding on probe Dan Carpenter
2010-08-12 14:35 ` Maxim Levitsky
2010-08-12 14:35 ` Maxim Levitsky
2010-08-12 16:19 ` Dan Carpenter
2010-08-12 16:19 ` Dan Carpenter
2010-08-12 16:42 ` Maxim Levitsky
2010-08-12 16:42 ` Maxim Levitsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100812074611.GI645@bicker \
--to=error27@gmail.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=maximlevitsky@gmail.com \
--cc=mchehab@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.