evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: iio: error case memory leak fix

Browse source 
The data pointer should be freed in the error
cases of adis16400_trigger_handler().

Signed-off-by: Andre Bartke <andre.bartke@gmail.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Andre Bartke 2011-06-02 00:21:45 +02:00 • committed by Greg Kroah-Hartman
parent 0d422f4237
commit 53aebb5312
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/staging/iio/imu/adis16400_ring.c
View file

@ -137,13 +137,13 @@ static irqreturn_t adis16400_trigger_handler(int irq, void *p)
if (st->variant->flags & ADIS16400_NO_BURST) { if (st->variant->flags & ADIS16400_NO_BURST) {
ret = adis16350_spi_read_all(&indio_dev->dev, st->rx); ret = adis16350_spi_read_all(&indio_dev->dev, st->rx);
if (ret < 0) if (ret < 0)
return ret; goto err;
for (; i < ring->scan_count; i++) for (; i < ring->scan_count; i++)
data[i] = *(s16 *)(st->rx + i*2); data[i] = *(s16 *)(st->rx + i*2);
} else { } else {
ret = adis16400_spi_read_burst(&indio_dev->dev, st->rx); ret = adis16400_spi_read_burst(&indio_dev->dev, st->rx);
if (ret < 0) if (ret < 0)
return ret; goto err;
for (; i < indio_dev->ring->scan_count; i++) { for (; i < indio_dev->ring->scan_count; i++) {
j = __ffs(mask); j = __ffs(mask);
mask &= ~(1 << j); mask &= ~(1 << j);
@ -158,9 +158,13 @@ static irqreturn_t adis16400_trigger_handler(int irq, void *p)
ring->access->store_to(indio_dev->ring, (u8 *) data, pf->timestamp); ring->access->store_to(indio_dev->ring, (u8 *) data, pf->timestamp);
iio_trigger_notify_done(indio_dev->trig); iio_trigger_notify_done(indio_dev->trig);
kfree(data);
kfree(data);
return IRQ_HANDLED; return IRQ_HANDLED;
err:
kfree(data);
return ret;
} }
void adis16400_unconfigure_ring(struct iio_dev *indio_dev) void adis16400_unconfigure_ring(struct iio_dev *indio_dev)