2021-12-14 01:41:52

by Jiasheng Jiang

[permalink] [raw]

Subject: [PATCH v2] drm/ast: potential dereference of null pointer

---

The return value of kzalloc() needs to be checked.
To avoid use of null pointer '&ast_state->base' in case of the
failure of alloc.

Fixes: f0adbc382b8b ("drm/ast: Allocate initial CRTC state of the correct size")
Signed-off-by: Jiasheng Jiang <[email protected]>
---
Changelog:

v1 -> v2

*Change 1. Add the else statement that calling
__drm_atomic_helper_crtc_reset() with a state of NULL.
---
drivers/gpu/drm/ast/ast_mode.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c
index 36d9575aa27b..65099f0359f9 100644
--- a/drivers/gpu/drm/ast/ast_mode.c
+++ b/drivers/gpu/drm/ast/ast_mode.c
@@ -1120,7 +1120,10 @@ static void ast_crtc_reset(struct drm_crtc *crtc)
if (crtc->state)
crtc->funcs->atomic_destroy_state(crtc, crtc->state);

- __drm_atomic_helper_crtc_reset(crtc, &ast_state->base);
+ if (ast_state)
+ __drm_atomic_helper_crtc_reset(crtc, &ast_state->base);
+ else
+ __drm_atomic_helper_crtc_reset(crtc, NULL);
}

static struct drm_crtc_state *
--
2.25.1

2021-12-14 08:59:59

by Thomas Zimmermann

[permalink] [raw]

Subject: Re: [PATCH v2] drm/ast: potential dereference of null pointer

---

Hi

Am 14.12.21 um 02:41 schrieb Jiasheng Jiang:
> The return value of kzalloc() needs to be checked.
> To avoid use of null pointer '&ast_state->base' in case of the
> failure of alloc.
>
> Fixes: f0adbc382b8b ("drm/ast: Allocate initial CRTC state of the correct size")
> Signed-off-by: Jiasheng Jiang <[email protected]>

Thanks a lot. I've added you patch to drm-misc-fixes.

Best regards
Thomas

> ---
> Changelog:
>
> v1 -> v2
>
> *Change 1. Add the else statement that calling
> __drm_atomic_helper_crtc_reset() with a state of NULL.
> ---
> drivers/gpu/drm/ast/ast_mode.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c
> index 36d9575aa27b..65099f0359f9 100644
> --- a/drivers/gpu/drm/ast/ast_mode.c
> +++ b/drivers/gpu/drm/ast/ast_mode.c
> @@ -1120,7 +1120,10 @@ static void ast_crtc_reset(struct drm_crtc *crtc)
> if (crtc->state)
> crtc->funcs->atomic_destroy_state(crtc, crtc->state);
>
> - __drm_atomic_helper_crtc_reset(crtc, &ast_state->base);
> + if (ast_state)
> + __drm_atomic_helper_crtc_reset(crtc, &ast_state->base);
> + else
> + __drm_atomic_helper_crtc_reset(crtc, NULL);
> }
>
> static struct drm_crtc_state *
>

--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Ivo Totev

---

Attachments:

OpenPGP_signature (840.00 B)
OpenPGP digital signature