On Thu, Dec 12, 2013 at 01:18:10PM +0000, Ian Abbott wrote:
> follow 2fd2bdfccae61efe18f6b92b6a45fbf936d75b48
>
Thank you Ian, I'll queue this patch for the 3.11 kernel.
Cheers,
--
Luis
> pcmuio_detach() is called by the comedi core even if pcmuio_attach()
> returned an error, so `dev->private` might be `NULL`. Check for that
> before dereferencing it.
>
> Also, as pointed out by Dan Carpenter, there is no need to check the
> pointer passed to `kfree()` is non-NULL, so remove that check.
>
> Signed-off-by: Ian Abbott <abbotti@xxxxxxxxx>
> ---
> Applies to 3.11.y only (e.g. Debian jessie/testing).
> ---
> drivers/staging/comedi/drivers/pcmuio.c | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/staging/comedi/drivers/pcmuio.c b/drivers/staging/comedi/drivers/pcmuio.c
> index c43b633..7211c6b 100644
> --- a/drivers/staging/comedi/drivers/pcmuio.c
> +++ b/drivers/staging/comedi/drivers/pcmuio.c
> @@ -680,12 +680,13 @@ static void pcmuio_detach(struct comedi_device *dev)
> struct pcmuio_private *devpriv = dev->private;
> int i;
>
> - for (i = 0; i < PCMUIO_MAX_ASICS; ++i) {
> - if (devpriv->asics[i].irq)
> - free_irq(devpriv->asics[i].irq, dev);
> - }
> - if (devpriv && devpriv->sprivs)
> + if (devpriv) {
> + for (i = 0; i < PCMUIO_MAX_ASICS; ++i) {
> + if (devpriv->asics[i].irq)
> + free_irq(devpriv->asics[i].irq, dev);
> + }
> kfree(devpriv->sprivs);
> + }
> comedi_legacy_detach(dev);
> }
>
> --
> 1.8.4.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe stable" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html