Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4dd2367 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

staging: comedi: 8255_pci: fix possible NULL deref during detach 



`pci_8255_detach()` will be called by the comedi core if
`pci_8255_attach_pci()` returns an error.  It currently assumes that
both `board` (assigned from the return value of `comedi_board(dev)`) and
`devpriv` (assigned from `dev->private`) are non-null, but they might
be null, leading to a null pointer dereference.

`pci_8255_detach()` doesn't need to do anything if either `board` or
`devpriv` are null, so just return early in this case.

Cc: <stable@vger.kernel.org> # 3.6.x
Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6681e633

drivers/staging/comedi/drivers/8255_pci.c

+2 −0
Original line number Diff line number Diff line
@@ -289,6 +289,8 @@ static void pci_8255_detach(struct comedi_device *dev) 
	struct comedi_subdevice *s;

	int i;



	if (!board || !devpriv)

		return;

	if (dev->subdevices) {

		for (i = 0; i < board->n_8255; i++) {

			s = &dev->subdevices[i];