This is a note to let you know that I've just added the patch titled
staging: comedi: amplc_pc236: fix possible NULL deref during detach
to the 3.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
staging-comedi-amplc_pc236-fix-possible-null-deref-during-detach.patch
and it can be found in the queue-3.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 2db012bd40b889d8e5483d3daa07af04c4c109d8 Mon Sep 17 00:00:00 2001
From: Ian Abbott <[email protected]>
Date: Wed, 3 Oct 2012 16:25:18 +0100
Subject: staging: comedi: amplc_pc236: fix possible NULL deref during detach
From: Ian Abbott <[email protected]>
commit 2db012bd40b889d8e5483d3daa07af04c4c109d8 upstream.
`pc236_detach()` is called by the comedi core to clean up if either
`pc236_attach()` or `pc236_attach_pci()` returns an error. It sets
`thisboard` to the return value of `comedi_board(dev)` and assumes it is
non-null. This is a valid assumption if `pc236_attach()` fails, but not
if `pc236_attach_pci()` fails, leading to a possible NULL pointer
dereference.
Check `thisboard` at the top of `pc236_detach()` and return early if it
is `NULL`. This is okay because the only other thing that could have
been allocated is `dev->private` and that is freed by the comedi core,
not by this function.
Signed-off-by: Ian Abbott <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/staging/comedi/drivers/amplc_pc236.c | 3 +++
1 file changed, 3 insertions(+)
--- a/drivers/staging/comedi/drivers/amplc_pc236.c
+++ b/drivers/staging/comedi/drivers/amplc_pc236.c
@@ -577,8 +577,11 @@ static int __devinit pc236_attach_pci(st
static void pc236_detach(struct comedi_device *dev)
{
+ const struct pc236_board *thisboard = comedi_board(dev);
struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+ if (!thisboard)
+ return;
if (dev->iobase)
pc236_intr_disable(dev);
if (dev->irq)
Patches currently in stable-queue which might be from [email protected] are
queue-3.6/staging-comedi-amplc_pc263-fix-possible-null-deref-during-detach.patch
queue-3.6/staging-comedi-das08-fix-possible-null-deref-during-detach.patch
queue-3.6/staging-comedi-ni_daq_700-fix-dio-subdevice-regression.patch
queue-3.6/staging-comedi-amplc_pc236-fix-possible-null-deref-during-detach.patch
queue-3.6/staging-comedi-ni_labpc-fix-possible-null-deref-during-detach.patch
queue-3.6/staging-comedi-amplc_dio200-fix-possible-null-deref-during-detach.patch
queue-3.6/staging-comedi-amplc_pc236-fix-invalid-register-access-during-detach.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
