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

Commit cb09d912 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: das16: fix das16_detach() 



The function das16_reset() needs a valid dev->iobase. Since the iobase
is requested after the devpriv has been allocated in the attach, move
the das16_reset() call into the if (devpriv) and add a if (dev->iobase).

Also, move the release of the extra iobase into the if (devpriv) to
prevent an invalid memory access.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent efb62316

drivers/staging/comedi/drivers/das16.c

+9 −4
Original line number Diff line number Diff line
@@ -1206,10 +1206,12 @@ static void das16_detach(struct comedi_device *dev) 
{

	const struct das16_board *board = comedi_board(dev);

	struct das16_private_struct *devpriv = dev->private;

	int i;



	das16_reset(dev);

	if (devpriv) {

		int i;

		if (dev->iobase)

			das16_reset(dev);



		for (i = 0; i < 2; i++) {

			if (devpriv->dma_buffer[i])

				pci_free_consistent(NULL, DAS16_DMA_SIZE,
@@ -1221,9 +1223,12 @@ static void das16_detach(struct comedi_device *dev) 
			free_dma(devpriv->dma_chan);

		kfree(devpriv->user_ai_range_table);

		kfree(devpriv->user_ao_range_table);

	}



		if (devpriv->extra_iobase)

		release_region(devpriv->extra_iobase, board->size & 0x3ff);

			release_region(devpriv->extra_iobase,

				       board->size & 0x3ff);

	}



	comedi_legacy_detach(dev);

}