| Message ID | 20210313172950.6224-1-krzysztof.kozlowski@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2,v4.4+,1/2] iio: imu: adis16400: release allocated memory on failure | expand |
On Sat, Mar 13, 2021 at 06:29:49PM +0100, Krzysztof Kozlowski wrote: > From: Navid Emamdoost <navid.emamdoost@gmail.com> > > commit ab612b1daf415b62c58e130cb3d0f30b255a14d0 upstream. > > 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: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> > > --- > > Changes since v1: > 1. Add also this one for backport: v4.4 - v4.14. Newer should take > direct cherry pick > --- > drivers/iio/imu/adis_buffer.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) Both patches now queued up, thanks for the backports. greg k-h
diff --git a/drivers/iio/imu/adis_buffer.c b/drivers/iio/imu/adis_buffer.c index 36607d52fee0..9de553e8c214 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 = kzalloc(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;