2023-10-27 09:29:54

by Peng Hao

Subject: [PATCH] gpu/drm/drm_framebuffer.c: Add judgement for return value of drm_get_format_info().

Since drm_get_format_info() may return NULL, so a judgement of return
value is needed to add.

Signed-off-by: Peng Hao <[email protected]>
---
drivers/gpu/drm/drm_framebuffer.c | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/drivers/gpu/drm/drm_framebuffer.c b/drivers/gpu/drm/drm_framebuffer.c
index aff3746dedfb..be7dd1998c04 100644
--- a/drivers/gpu/drm/drm_framebuffer.c
+++ b/drivers/gpu/drm/drm_framebuffer.c
@@ -194,6 +194,10 @@ static int framebuffer_check(struct drm_device *dev,

/* now let the driver pick its own format info */
info = drm_get_format_info(dev, r);
+ if (!info) {
+ drm_dbg_kms(dev, "no matched format info\n");
+ return -EFAULT;
+ }

for (i = 0; i < info->num_planes; i++) {
unsigned int width = fb_plane_width(r->width, info, i);
--
2.37.1

2023-10-27 12:33:13

by Ville Syrjälä

Subject: Re: [PATCH] gpu/drm/drm_framebuffer.c: Add judgement for return value of drm_get_format_info().

On Fri, Oct 27, 2023 at 05:19:12PM +0800, Peng Hao wrote:
> Since drm_get_format_info() may return NULL,

Not in this case since we already checked it earlier.

> so a judgement of return
> value is needed to add.
>
> Signed-off-by: Peng Hao <[email protected]>
> ---
> drivers/gpu/drm/drm_framebuffer.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/gpu/drm/drm_framebuffer.c b/drivers/gpu/drm/drm_framebuffer.c
> index aff3746dedfb..be7dd1998c04 100644
> --- a/drivers/gpu/drm/drm_framebuffer.c
> +++ b/drivers/gpu/drm/drm_framebuffer.c
> @@ -194,6 +194,10 @@ static int framebuffer_check(struct drm_device *dev,
>
> /* now let the driver pick its own format info */
> info = drm_get_format_info(dev, r);
> + if (!info) {
> + drm_dbg_kms(dev, "no matched format info\n");
> + return -EFAULT;
> + }
>
> for (i = 0; i < info->num_planes; i++) {
> unsigned int width = fb_plane_width(r->width, info, i);
> --
> 2.37.1

--
Ville Syrj?l?
Intel