* [PATCH stable v4.4] iio: imu: adis16400: fix memory leak
@ 2021-03-12 17:03 Krzysztof Kozlowski
2021-03-13 13:37 ` Greg KH
0 siblings, 1 reply; 3+ messages in thread
From: Krzysztof Kozlowski @ 2021-03-12 17:03 UTC (permalink / raw)
To: stable
Cc: Navid Emamdoost, Alexandru Ardelean, Jonathan Cameron,
Krzysztof Kozlowski
From: Navid Emamdoost <navid.emamdoost@gmail.com>
commit 9c0530e898f384c5d279bfcebd8bb17af1105873 upstream.
In adis_update_scan_mode_burst, if adis->buffer allocation fails release
the adis->xfer.
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>
(cherry picked from commit 9c0530e898f384c5d279bfcebd8bb17af1105873)
[krzk: backport applied to adis16400_buffer.c instead of adis_buffer.c]
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
---
drivers/iio/imu/adis16400_buffer.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/iio/imu/adis16400_buffer.c b/drivers/iio/imu/adis16400_buffer.c
index 90c24a23c679..c0eb9dfd1c45 100644
--- a/drivers/iio/imu/adis16400_buffer.c
+++ b/drivers/iio/imu/adis16400_buffer.c
@@ -37,8 +37,11 @@ int adis16400_update_scan_mode(struct iio_dev *indio_dev,
return -ENOMEM;
adis->buffer = kzalloc(burst_length + sizeof(u16), GFP_KERNEL);
- if (!adis->buffer)
+ if (!adis->buffer) {
+ kfree(adis->xfer);
+ adis->xfer = NULL;
return -ENOMEM;
+ }
tx = adis->buffer + burst_length;
tx[0] = ADIS_READ_REG(ADIS16400_GLOB_CMD);
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH stable v4.4] iio: imu: adis16400: fix memory leak
2021-03-12 17:03 [PATCH stable v4.4] iio: imu: adis16400: fix memory leak Krzysztof Kozlowski
@ 2021-03-13 13:37 ` Greg KH
2021-03-13 17:09 ` Krzysztof Kozlowski
0 siblings, 1 reply; 3+ messages in thread
From: Greg KH @ 2021-03-13 13:37 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: stable, Navid Emamdoost, Alexandru Ardelean, Jonathan Cameron
On Fri, Mar 12, 2021 at 06:03:11PM +0100, Krzysztof Kozlowski wrote:
> From: Navid Emamdoost <navid.emamdoost@gmail.com>
>
> commit 9c0530e898f384c5d279bfcebd8bb17af1105873 upstream.
>
> In adis_update_scan_mode_burst, if adis->buffer allocation fails release
> the adis->xfer.
>
> 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>
> (cherry picked from commit 9c0530e898f384c5d279bfcebd8bb17af1105873)
> [krzk: backport applied to adis16400_buffer.c instead of adis_buffer.c]
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
> ---
> drivers/iio/imu/adis16400_buffer.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
What about 4.9.y? Will this backport also work there too?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH stable v4.4] iio: imu: adis16400: fix memory leak
2021-03-13 13:37 ` Greg KH
@ 2021-03-13 17:09 ` Krzysztof Kozlowski
0 siblings, 0 replies; 3+ messages in thread
From: Krzysztof Kozlowski @ 2021-03-13 17:09 UTC (permalink / raw)
To: Greg KH; +Cc: stable, Navid Emamdoost, Alexandru Ardelean, Jonathan Cameron
On 13/03/2021 14:37, Greg KH wrote:
> On Fri, Mar 12, 2021 at 06:03:11PM +0100, Krzysztof Kozlowski wrote:
>> From: Navid Emamdoost <navid.emamdoost@gmail.com>
>>
>> commit 9c0530e898f384c5d279bfcebd8bb17af1105873 upstream.
>>
>> In adis_update_scan_mode_burst, if adis->buffer allocation fails release
>> the adis->xfer.
>>
>> 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>
>> (cherry picked from commit 9c0530e898f384c5d279bfcebd8bb17af1105873)
>> [krzk: backport applied to adis16400_buffer.c instead of adis_buffer.c]
>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
>> ---
>> drivers/iio/imu/adis16400_buffer.c | 5 ++++-
>> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> What about 4.9.y? Will this backport also work there too?
Yes, v4.4 and v4.9. However I noticed that second patch similar patch
was not backported, so let me send v2 of this backport.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-03-13 17:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-12 17:03 [PATCH stable v4.4] iio: imu: adis16400: fix memory leak Krzysztof Kozlowski
2021-03-13 13:37 ` Greg KH
2021-03-13 17:09 ` Krzysztof Kozlowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).