The patch titled
drivers/media/IR/ene_ir.c: fix NULL dereference
has been added to the -mm tree. Its filename is
drivers-media-ir-ene_irc-fix-null-dereference.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: drivers/media/IR/ene_ir.c: fix NULL dereference
From: Jiri Slaby <jslaby@xxxxxxx>
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@xxxxxxx>
Cc: Maxim Levitsky <maximlevitsky@xxxxxxxxx>
Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/media/IR/ene_ir.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN drivers/media/IR/ene_ir.c~drivers-media-ir-ene_irc-fix-null-dereference drivers/media/IR/ene_ir.c
--- a/drivers/media/IR/ene_ir.c~drivers-media-ir-ene_irc-fix-null-dereference
+++ a/drivers/media/IR/ene_ir.c
@@ -785,7 +785,7 @@ static int ene_probe(struct pnp_dev *pnp
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);
_
Patches currently in -mm which might be from jslaby@xxxxxxx are
linux-next.patch
drivers-media-ir-ene_irc-fix-null-dereference.patch
hpet-unmap-unused-i-o-space.patch
softirq-improve-preempt-count-error-message.patch
leds-route-kbd-leds-through-the-generic-leds-layer.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
