summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChase Southwood <chase.southwood@yahoo.com>2014-02-07 23:02:27 -0600
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-02-11 12:22:32 -0800
commit777e5d3ed55749e44febe3ae18dd9f0050bb8102 (patch)
treebff4d005fe66a21ffcd343775957b7b96f00a1df
parent8542373dccd2f5dd4dac0a552e2a22fc4402dbe9 (diff)
downloadop-kernel-dev-777e5d3ed55749e44febe3ae18dd9f0050bb8102.zip
op-kernel-dev-777e5d3ed55749e44febe3ae18dd9f0050bb8102.tar.gz
Staging: comedi: fix memory leak in comedi_bond.c
We allocate bdev and then krealloc the devs pointer in order to add bdev at the end of the devpriv->devs array list. But if for some reason this krealloc fails, we need to free bdev before returning an error otherwise this memory is leaked. Signed-off-by: Chase Southwood <chase.southwood@yahoo.com> Acked-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/comedi/drivers/comedi_bond.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/comedi/drivers/comedi_bond.c b/drivers/staging/comedi/drivers/comedi_bond.c
index 51a59e5..406aedb 100644
--- a/drivers/staging/comedi/drivers/comedi_bond.c
+++ b/drivers/staging/comedi/drivers/comedi_bond.c
@@ -254,6 +254,7 @@ static int do_dev_config(struct comedi_device *dev, struct comedi_devconfig *it)
if (!devs) {
dev_err(dev->class_dev,
"Could not allocate memory. Out of memory?\n");
+ kfree(bdev);
return -ENOMEM;
}
devpriv->devs = devs;
OpenPOWER on IntegriCloud