lkml.org 
[lkml]   [2019]   [Oct]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 090/100] iio: imu: adis16400: release allocated memory on failure
    Date
    From: Navid Emamdoost <navid.emamdoost@gmail.com>

    [ 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>
    ---
    drivers/iio/imu/adis_buffer.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/drivers/iio/imu/adis_buffer.c b/drivers/iio/imu/adis_buffer.c
    index 76643c5571aa8..e59d0438de732 100644
    --- a/drivers/iio/imu/adis_buffer.c
    +++ b/drivers/iio/imu/adis_buffer.c
    @@ -39,8 +39,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;
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-10-19 00:17    [W:4.101 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site