Home Home > GIT Browse
diff options
authorIan Abbott <abbotti@mev.co.uk>2013-08-23 12:37:17 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-08-29 09:47:36 -0700
commit6f123e952c4144ddda16ebdac765677ebdf6f37c (patch)
parent90dbc54a171ca7fd96c35d2858d30baf5d7c6376 (diff)
staging: comedi: bug-fix NULL pointer dereference on failed attach
commit 3955dfa8216f712bc204a5ad2f4e51efff252fde upstream. Commit dcd7b8bd63cb81c5b973bf86510ca3c80bbbd162 ("staging: comedi: put module _after_ detach" by myself) reversed a couple of calls in `comedi_device_attach()` when recovering from an error returned by the low-level driver's 'attach' handler. Unfortunately, that introduced a NULL pointer dereference bug as `dev->driver` is NULL after the call to `comedi_device_detach()`. We still have a pointer to the low-level comedi driver structure in the `driv` variable, so use that instead. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c
index 06d190f8fd34..4a2b04277304 100644
--- a/drivers/staging/comedi/drivers.c
+++ b/drivers/staging/comedi/drivers.c
@@ -464,7 +464,7 @@ int comedi_device_attach(struct comedi_device *dev, struct comedi_devconfig *it)
ret = comedi_device_postconfig(dev);
if (ret < 0) {
- module_put(dev->driver->module);
+ module_put(driv->module);
/* On success, the driver module count has been incremented. */
return ret;