diff options
| author |   Kumar Amit Mehta <gmate.amit@gmail.com> | 2014-02-26 01:04:45 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-27 08:38:12 -0800 |
| commit | c095fad35ec72835540b3a9b1166dcd83a74ade3 (patch) | |
| tree | 36787d29a7beff1772d1dc3f70f792cc4b9ea937 | |
| parent | Staging: comedi: Fix unnecessary space after function pointer (diff) | |
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>
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_mio_common.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c index 8adb535516bd..3a86d482babd 100644 --- a/drivers/staging/comedi/drivers/ni_mio_common.c +++ b/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)]; |