iio: adc: xilinx-ams: fix devm_krealloc() return value check

[PATCH] iio: adc: xilinx-ams: fix devm_krealloc() return value check

Posted by Marco Pagani 2 years, 9 months ago

The clang-analyzer reported a warning: "Value stored to 'ret'
is never read".

Fix the return value check if devm_krealloc() fails to resize
ams_channels.

Fixes: d5c70627a794 ("iio: adc: Add Xilinx AMS driver")
Signed-off-by: Marco Pagani <marpagan@redhat.com>
---
 drivers/iio/adc/xilinx-ams.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/iio/adc/xilinx-ams.c b/drivers/iio/adc/xilinx-ams.c
index 5b4bdf3a26bb..a507d2e17079 100644
--- a/drivers/iio/adc/xilinx-ams.c
+++ b/drivers/iio/adc/xilinx-ams.c
@@ -1329,7 +1329,7 @@ static int ams_parse_firmware(struct iio_dev *indio_dev)
 
 	dev_channels = devm_krealloc(dev, ams_channels, dev_size, GFP_KERNEL);
 	if (!dev_channels)
-		ret = -ENOMEM;
+		return -ENOMEM;
 
 	indio_dev->channels = dev_channels;
 	indio_dev->num_channels = num_channels;
-- 
2.38.1

Re: [PATCH] iio: adc: xilinx-ams: fix devm_krealloc() return value check

Posted by Michal Simek 2 years, 9 months ago


On 11/25/22 12:31, Marco Pagani wrote:
> CAUTION: This message has originated from an External Source. Please use proper judgment and caution when opening attachments, clicking links, or responding to this email.
> 
> 
> The clang-analyzer reported a warning: "Value stored to 'ret'
> is never read".
> 
> Fix the return value check if devm_krealloc() fails to resize
> ams_channels.
> 
> Fixes: d5c70627a794 ("iio: adc: Add Xilinx AMS driver")
> Signed-off-by: Marco Pagani <marpagan@redhat.com>
> ---
>   drivers/iio/adc/xilinx-ams.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/iio/adc/xilinx-ams.c b/drivers/iio/adc/xilinx-ams.c
> index 5b4bdf3a26bb..a507d2e17079 100644
> --- a/drivers/iio/adc/xilinx-ams.c
> +++ b/drivers/iio/adc/xilinx-ams.c
> @@ -1329,7 +1329,7 @@ static int ams_parse_firmware(struct iio_dev *indio_dev)
> 
>          dev_channels = devm_krealloc(dev, ams_channels, dev_size, GFP_KERNEL);
>          if (!dev_channels)
> -               ret = -ENOMEM;
> +               return -ENOMEM;
> 
>          indio_dev->channels = dev_channels;
>          indio_dev->num_channels = num_channels;
> --
> 2.38.1
> 

Acked-by: Michal Simek <michal.simek@amd.com>

Thanks,
Michal

Re: [PATCH] iio: adc: xilinx-ams: fix devm_krealloc() return value check

Posted by Jonathan Cameron 2 years, 9 months ago

On Wed, 30 Nov 2022 18:04:26 +0100
Michal Simek <michal.simek@amd.com> wrote:

> On 11/25/22 12:31, Marco Pagani wrote:
> > CAUTION: This message has originated from an External Source. Please use proper judgment and caution when opening attachments, clicking links, or responding to this email.
> > 
> > 
> > The clang-analyzer reported a warning: "Value stored to 'ret'
> > is never read".
> > 
> > Fix the return value check if devm_krealloc() fails to resize
> > ams_channels.
> > 
> > Fixes: d5c70627a794 ("iio: adc: Add Xilinx AMS driver")
> > Signed-off-by: Marco Pagani <marpagan@redhat.com>
> > ---
> >   drivers/iio/adc/xilinx-ams.c | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/drivers/iio/adc/xilinx-ams.c b/drivers/iio/adc/xilinx-ams.c
> > index 5b4bdf3a26bb..a507d2e17079 100644
> > --- a/drivers/iio/adc/xilinx-ams.c
> > +++ b/drivers/iio/adc/xilinx-ams.c
> > @@ -1329,7 +1329,7 @@ static int ams_parse_firmware(struct iio_dev *indio_dev)
> > 
> >          dev_channels = devm_krealloc(dev, ams_channels, dev_size, GFP_KERNEL);
> >          if (!dev_channels)
> > -               ret = -ENOMEM;
> > +               return -ENOMEM;
> > 
> >          indio_dev->channels = dev_channels;
> >          indio_dev->num_channels = num_channels;
> > --
> > 2.38.1
> >   
> 
> Acked-by: Michal Simek <michal.simek@amd.com>

Applied to the fixes-togreg branch of iio.git.  Given merge window opening soon
it might be a few weeks before this goes upstream.

Thanks,

Jonathan

> 
> Thanks,
> Michal