This is a note to let you know that I've just added the patch titled
staging: comedi: das08: 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-das08-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 ee280d134f2e05e0172369a53fbe202dbfc527fa Mon Sep 17 00:00:00 2001
From: Ian Abbott <[email protected]>
Date: Wed, 3 Oct 2012 16:25:20 +0100
Subject: staging: comedi: das08: fix possible NULL deref during detach
From: Ian Abbott <[email protected]>
commit ee280d134f2e05e0172369a53fbe202dbfc527fa upstream.
`das08_detach()` is called by the comedi core to clean up if either
`das08_attach()` or `das08_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 `das08_attach()` fails, but not
if `das08_attach_pci()` fails, leading to a possible NULL pointer
dereference.
Check `thisboard` at the top of `das08_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/das08.c | 2 ++
1 file changed, 2 insertions(+)
--- a/drivers/staging/comedi/drivers/das08.c
+++ b/drivers/staging/comedi/drivers/das08.c
@@ -1028,6 +1028,8 @@ static void __maybe_unused das08_detach(
const struct das08_board_struct *thisboard = comedi_board(dev);
struct das08_private_struct *devpriv = dev->private;
+ if (!thisboard)
+ return;
das08_common_detach(dev);
if (IS_ENABLED(CONFIG_COMEDI_DAS08_ISA) &&
(thisboard->bustype == isa || thisboard->bustype == pc104)) {
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
