| Message ID | 20201209161510.31399-1-dafna.hirschfeld@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: rkisp1: rsz: crash fix when setting src format | expand |
On 12/9/20 1:15 PM, Dafna Hirschfeld wrote: > When setting the source media bus code in the resizer, > we first check that the current media bus code in the > source is yuv encoded format. This is done by > retrieving the data from the formats list of the isp > entity. This cause a crash when the media bus code on the > source is YUYV8_1_5X8 which is not supported by the isp > entity. Instead we should test the sink format of the resizer > which is guaranteed to be supported by the isp entity. > > Fixes: 251b6eebb6c49 ("media: staging: rkisp1: rsz: Add support to more YUV encoded mbus codes on src pad") > Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com> Acked-by: Helen Koike <helen.koike@collabora.com> Thanks Helen > --- > drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c > index 813670ed9577..79deed8adcea 100644 > --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c > +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c > @@ -520,14 +520,15 @@ static void rkisp1_rsz_set_src_fmt(struct rkisp1_resizer *rsz, > struct v4l2_mbus_framefmt *format, > unsigned int which) > { > - const struct rkisp1_isp_mbus_info *mbus_info; > - struct v4l2_mbus_framefmt *src_fmt; > + const struct rkisp1_isp_mbus_info *sink_mbus_info; > + struct v4l2_mbus_framefmt *src_fmt, *sink_fmt; > > + sink_fmt = rkisp1_rsz_get_pad_fmt(rsz, cfg, RKISP1_RSZ_PAD_SINK, which); > src_fmt = rkisp1_rsz_get_pad_fmt(rsz, cfg, RKISP1_RSZ_PAD_SRC, which); > - mbus_info = rkisp1_isp_mbus_info_get(src_fmt->code); > + sink_mbus_info = rkisp1_isp_mbus_info_get(sink_fmt->code); > > /* for YUV formats, userspace can change the mbus code on the src pad if it is supported */ > - if (mbus_info->pixel_enc == V4L2_PIXEL_ENC_YUV && > + if (sink_mbus_info->pixel_enc == V4L2_PIXEL_ENC_YUV && > rkisp1_rsz_get_yuv_mbus_info(format->code)) > src_fmt->code = format->code; > >
Hey Dafna, Thanks for the patch, I quickly tested it and did some proofreading. I was able to recreate the crash with following commands: "media-ctl" "-d" "platform:rkisp1" "--set-v4l2" '"rkisp1_resizer_mainpath":1 [fmt:YUYV8_1_5X8/900x800]' "media-ctl" "-d" "platform:rkisp1" "--set-v4l2" '"rkisp1_resizer_mainpath":1 [fmt:YUYV8_2X8/900x800]' # This causes the crash: "Unable to handle kernel NULL pointer dereference at virtual address 0000000000000004" This patch fixed the problem. On 09.12.2020 17:15, Dafna Hirschfeld wrote: >When setting the source media bus code in the resizer, >we first check that the current media bus code in the >source is yuv encoded format. This is done by s/is/is a/ >retrieving the data from the formats list of the isp >entity. This cause a crash when the media bus code on the s/cause/causes/ >source is YUYV8_1_5X8 which is not supported by the isp >entity. Instead we should test the sink format of the resizer >which is guaranteed to be supported by the isp entity. > >Fixes: 251b6eebb6c49 ("media: staging: rkisp1: rsz: Add support to more YUV encoded mbus codes on src pad") >Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com> Tested-by: Sebastian Fricke <sebastian.fricke.linux@gmail.com> >--- > drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > >diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c >index 813670ed9577..79deed8adcea 100644 >--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c >+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c >@@ -520,14 +520,15 @@ static void rkisp1_rsz_set_src_fmt(struct rkisp1_resizer *rsz, > struct v4l2_mbus_framefmt *format, > unsigned int which) > { >- const struct rkisp1_isp_mbus_info *mbus_info; >- struct v4l2_mbus_framefmt *src_fmt; >+ const struct rkisp1_isp_mbus_info *sink_mbus_info; >+ struct v4l2_mbus_framefmt *src_fmt, *sink_fmt; > >+ sink_fmt = rkisp1_rsz_get_pad_fmt(rsz, cfg, RKISP1_RSZ_PAD_SINK, which); > src_fmt = rkisp1_rsz_get_pad_fmt(rsz, cfg, RKISP1_RSZ_PAD_SRC, which); >- mbus_info = rkisp1_isp_mbus_info_get(src_fmt->code); >+ sink_mbus_info = rkisp1_isp_mbus_info_get(sink_fmt->code); > > /* for YUV formats, userspace can change the mbus code on the src pad if it is supported */ >- if (mbus_info->pixel_enc == V4L2_PIXEL_ENC_YUV && >+ if (sink_mbus_info->pixel_enc == V4L2_PIXEL_ENC_YUV && > rkisp1_rsz_get_yuv_mbus_info(format->code)) > src_fmt->code = format->code; > >-- >2.17.1 >
On Thu, Dec 10, 2020 at 1:15 AM Dafna Hirschfeld <dafna.hirschfeld@collabora.com> wrote: > > When setting the source media bus code in the resizer, > we first check that the current media bus code in the > source is yuv encoded format. This is done by > retrieving the data from the formats list of the isp > entity. This cause a crash when the media bus code on the > source is YUYV8_1_5X8 which is not supported by the isp > entity. Instead we should test the sink format of the resizer > which is guaranteed to be supported by the isp entity. > > Fixes: 251b6eebb6c49 ("media: staging: rkisp1: rsz: Add support to more YUV encoded mbus codes on src pad") > Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com> > --- > drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c > index 813670ed9577..79deed8adcea 100644 > --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c > +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c > @@ -520,14 +520,15 @@ static void rkisp1_rsz_set_src_fmt(struct rkisp1_resizer *rsz, > struct v4l2_mbus_framefmt *format, > unsigned int which) > { > - const struct rkisp1_isp_mbus_info *mbus_info; > - struct v4l2_mbus_framefmt *src_fmt; > + const struct rkisp1_isp_mbus_info *sink_mbus_info; > + struct v4l2_mbus_framefmt *src_fmt, *sink_fmt; > > + sink_fmt = rkisp1_rsz_get_pad_fmt(rsz, cfg, RKISP1_RSZ_PAD_SINK, which); > src_fmt = rkisp1_rsz_get_pad_fmt(rsz, cfg, RKISP1_RSZ_PAD_SRC, which); > - mbus_info = rkisp1_isp_mbus_info_get(src_fmt->code); > + sink_mbus_info = rkisp1_isp_mbus_info_get(sink_fmt->code); > > /* for YUV formats, userspace can change the mbus code on the src pad if it is supported */ > - if (mbus_info->pixel_enc == V4L2_PIXEL_ENC_YUV && > + if (sink_mbus_info->pixel_enc == V4L2_PIXEL_ENC_YUV && > rkisp1_rsz_get_yuv_mbus_info(format->code)) > src_fmt->code = format->code; > > -- > 2.17.1 > Gentle ping on this patch. I think it should also go to stable, as it fixes a crash. Best regards, Tomasz
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c index 813670ed9577..79deed8adcea 100644 --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c @@ -520,14 +520,15 @@ static void rkisp1_rsz_set_src_fmt(struct rkisp1_resizer *rsz, struct v4l2_mbus_framefmt *format, unsigned int which) { - const struct rkisp1_isp_mbus_info *mbus_info; - struct v4l2_mbus_framefmt *src_fmt; + const struct rkisp1_isp_mbus_info *sink_mbus_info; + struct v4l2_mbus_framefmt *src_fmt, *sink_fmt; + sink_fmt = rkisp1_rsz_get_pad_fmt(rsz, cfg, RKISP1_RSZ_PAD_SINK, which); src_fmt = rkisp1_rsz_get_pad_fmt(rsz, cfg, RKISP1_RSZ_PAD_SRC, which); - mbus_info = rkisp1_isp_mbus_info_get(src_fmt->code); + sink_mbus_info = rkisp1_isp_mbus_info_get(sink_fmt->code); /* for YUV formats, userspace can change the mbus code on the src pad if it is supported */ - if (mbus_info->pixel_enc == V4L2_PIXEL_ENC_YUV && + if (sink_mbus_info->pixel_enc == V4L2_PIXEL_ENC_YUV && rkisp1_rsz_get_yuv_mbus_info(format->code)) src_fmt->code = format->code;
When setting the source media bus code in the resizer, we first check that the current media bus code in the source is yuv encoded format. This is done by retrieving the data from the formats list of the isp entity. This cause a crash when the media bus code on the source is YUYV8_1_5X8 which is not supported by the isp entity. Instead we should test the sink format of the resizer which is guaranteed to be supported by the isp entity. Fixes: 251b6eebb6c49 ("media: staging: rkisp1: rsz: Add support to more YUV encoded mbus codes on src pad") Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com> --- drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)