This is a note to let you know that I've just added the patch titled
staging: comedi: ni_labpc: 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-ni_labpc-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 922b67c1ac53014d80649a961a2fde700cd065d8 Mon Sep 17 00:00:00 2001
From: Ian Abbott <[email protected]>
Date: Wed, 3 Oct 2012 16:25:21 +0100
Subject: staging: comedi: ni_labpc: fix possible NULL deref during detach
From: Ian Abbott <[email protected]>
commit 922b67c1ac53014d80649a961a2fde700cd065d8 upstream.
`labpc_common_detach()` is called by the comedi core to clean up if
either `labpc_attach()` (including the one in the "ni_labpc_cs" module)
or `labpc_attach_pci()` returns an error. It assumes the `thisboard`
macro (expanding to `((struct labpc_board_struct *)dev->board_ptr)`) is
non-null. This is a valid assumption if `labpc_attach()` fails, but not
if `labpc_attach_pci()` fails, leading to a possible NULL pointer
dereference.
Check `thisboard` at the top of `labpc_common_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/ni_labpc.c | 2 ++
1 file changed, 2 insertions(+)
--- a/drivers/staging/comedi/drivers/ni_labpc.c
+++ b/drivers/staging/comedi/drivers/ni_labpc.c
@@ -809,6 +809,8 @@ static int labpc_find_device(struct come
void labpc_common_detach(struct comedi_device *dev)
{
+ if (!thisboard)
+ return;
if (dev->subdevices)
subdev_8255_cleanup(dev, dev->subdevices + 2);
#ifdef CONFIG_ISA_DMA_API
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
