Browse Source

staging: comedi: drivers: fix for a potential NULL pointer dereference

Return -ENOMEM in ni_E_init if ni_gpct_device_construct returns NULL

Signed-off-by: Kumar Amit Mehta <gmate.amit@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Kumar Amit Mehta 11 years ago
parent
commit
c095fad35e
1 changed files with 3 additions and 0 deletions
  1. 3 0
      drivers/staging/comedi/drivers/ni_mio_common.c

+ 3 - 0
drivers/staging/comedi/drivers/ni_mio_common.c

@@ -4407,6 +4407,9 @@ static int ni_E_init(struct comedi_device *dev)
 							&ni_gpct_read_register,
 							counter_variant,
 							NUM_GPCT);
+	if (!devpriv->counter_dev)
+		return -ENOMEM;
+
 	/* General purpose counters */
 	for (j = 0; j < NUM_GPCT; ++j) {
 		s = &dev->subdevices[NI_GPCT_SUBDEV(j)];