]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
iio: imu: adis16400: release allocated memory on failure
authorNavid Emamdoost <navid.emamdoost@gmail.com>
Thu, 19 Sep 2019 15:50:02 +0000 (10:50 -0500)
committerStefan Bader <stefan.bader@canonical.com>
Tue, 12 Nov 2019 17:47:13 +0000 (18:47 +0100)
BugLink: https://bugs.launchpad.net/bugs/1851550
[ Upstream commit ab612b1daf415b62c58e130cb3d0f30b255a14d0 ]

In adis_update_scan_mode, if allocation for adis->buffer fails,
previously allocated adis->xfer needs to be released.

Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
Reviewed-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Connor Kuehl <connor.kuehl@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
drivers/iio/imu/adis_buffer.c

index 9ac8356d9a954b0189dbdf38627c8b48d086d9a6..f446ff497809196641a02654583a657c52a9e73d 100644 (file)
@@ -78,8 +78,11 @@ int adis_update_scan_mode(struct iio_dev *indio_dev,
                return -ENOMEM;
 
        adis->buffer = kcalloc(indio_dev->scan_bytes, 2, GFP_KERNEL);
-       if (!adis->buffer)
+       if (!adis->buffer) {
+               kfree(adis->xfer);
+               adis->xfer = NULL;
                return -ENOMEM;
+       }
 
        rx = adis->buffer;
        tx = rx + scan_count;