2022-02-13 03:00:54

by Alexander Stein

Subject: [PATCH v2 4/9] media: imx: Fail conversion if pixel format not supported

From: Dorota Czaplejewicz <[email protected]>

imx_media_find_mbus_format has NULL as a valid return value,
therefore the caller should take it into account.

Signed-off-by: Dorota Czaplejewicz <[email protected]>
Signed-off-by: Alexander Stein <[email protected]>
---
drivers/staging/media/imx/imx-media-utils.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/drivers/staging/media/imx/imx-media-utils.c b/drivers/staging/media/imx/imx-media-utils.c
index 02a4cb124d37..e59aaa77172a 100644
--- a/drivers/staging/media/imx/imx-media-utils.c
+++ b/drivers/staging/media/imx/imx-media-utils.c
@@ -544,6 +544,9 @@ static int imx56_media_mbus_fmt_to_pix_fmt(struct v4l2_pix_format *pix,
cc = imx_media_find_mbus_format(code, PIXFMT_SEL_YUV);
}

+ if (!cc)
+ return -EINVAL;
+
/* Round up width for minimum burst size */
width = round_up(mbus->width, 8);

--
2.25.1

2022-02-15 08:27:40

by Laurent Pinchart

Subject: Re: [PATCH v2 4/9] media: imx: Fail conversion if pixel format not supported

Hi Alexander and Dorota,

Thank you for the patch.

On Fri, Feb 11, 2022 at 03:27:47PM +0100, Alexander Stein wrote:
> From: Dorota Czaplejewicz <[email protected]>
>
> imx_media_find_mbus_format has NULL as a valid return value,
> therefore the caller should take it into account.
>
> Signed-off-by: Dorota Czaplejewicz <[email protected]>
> Signed-off-by: Alexander Stein <[email protected]>

Reviewed-by: Laurent Pinchart <[email protected]>

> ---
> drivers/staging/media/imx/imx-media-utils.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/staging/media/imx/imx-media-utils.c b/drivers/staging/media/imx/imx-media-utils.c
> index 02a4cb124d37..e59aaa77172a 100644
> --- a/drivers/staging/media/imx/imx-media-utils.c
> +++ b/drivers/staging/media/imx/imx-media-utils.c
> @@ -544,6 +544,9 @@ static int imx56_media_mbus_fmt_to_pix_fmt(struct v4l2_pix_format *pix,
> cc = imx_media_find_mbus_format(code, PIXFMT_SEL_YUV);
> }
>
> + if (!cc)
> + return -EINVAL;
> +
> /* Round up width for minimum burst size */
> width = round_up(mbus->width, 8);
>

--
Regards,

Laurent Pinchart