* [PATCH] drm/msm/mdp5: check the return of kzalloc()
@ 2022-03-24 8:36 ` xkernel.wang
0 siblings, 0 replies; 6+ messages in thread
From: xkernel.wang @ 2022-03-24 8:36 UTC (permalink / raw)
To: robdclark, sean, airlied, daniel
Cc: linux-arm-msm, dri-devel, freedreno, linux-kernel, Xiaoke Wang
From: Xiaoke Wang <xkernel.wang@foxmail.com>
kzalloc() is a memory allocation function which can return NULL when
some internal memory errors happen. So it is better to check it to
prevent potential wrong memory access.
Signed-off-by: Xiaoke Wang <xkernel.wang@foxmail.com>
---
drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
index c6b69af..5f914cc 100644
--- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
+++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
@@ -90,15 +90,18 @@ static void mdp5_plane_reset(struct drm_plane *plane)
__drm_atomic_helper_plane_destroy_state(plane->state);
kfree(to_mdp5_plane_state(plane->state));
- mdp5_state = kzalloc(sizeof(*mdp5_state), GFP_KERNEL);
+ plane->state = NULL;
- if (plane->type == DRM_PLANE_TYPE_PRIMARY)
- mdp5_state->base.zpos = STAGE_BASE;
- else
- mdp5_state->base.zpos = STAGE0 + drm_plane_index(plane);
- mdp5_state->base.normalized_zpos = mdp5_state->base.zpos;
+ mdp5_state = kzalloc(sizeof(*mdp5_state), GFP_KERNEL);
+ if (mdp5_state) {
+ if (plane->type == DRM_PLANE_TYPE_PRIMARY)
+ mdp5_state->base.zpos = STAGE_BASE;
+ else
+ mdp5_state->base.zpos = STAGE0 + drm_plane_index(plane);
+ mdp5_state->base.normalized_zpos = mdp5_state->base.zpos;
- __drm_atomic_helper_plane_reset(plane, &mdp5_state->base);
+ __drm_atomic_helper_plane_reset(plane, &mdp5_state->base);
+ }
}
static struct drm_plane_state *
--
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH] drm/msm/mdp5: check the return of kzalloc()
@ 2022-03-24 8:36 ` xkernel.wang
0 siblings, 0 replies; 6+ messages in thread
From: xkernel.wang @ 2022-03-24 8:36 UTC (permalink / raw)
To: robdclark, sean, airlied, daniel
Cc: linux-arm-msm, freedreno, linux-kernel, dri-devel, Xiaoke Wang
From: Xiaoke Wang <xkernel.wang@foxmail.com>
kzalloc() is a memory allocation function which can return NULL when
some internal memory errors happen. So it is better to check it to
prevent potential wrong memory access.
Signed-off-by: Xiaoke Wang <xkernel.wang@foxmail.com>
---
drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
index c6b69af..5f914cc 100644
--- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
+++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
@@ -90,15 +90,18 @@ static void mdp5_plane_reset(struct drm_plane *plane)
__drm_atomic_helper_plane_destroy_state(plane->state);
kfree(to_mdp5_plane_state(plane->state));
- mdp5_state = kzalloc(sizeof(*mdp5_state), GFP_KERNEL);
+ plane->state = NULL;
- if (plane->type == DRM_PLANE_TYPE_PRIMARY)
- mdp5_state->base.zpos = STAGE_BASE;
- else
- mdp5_state->base.zpos = STAGE0 + drm_plane_index(plane);
- mdp5_state->base.normalized_zpos = mdp5_state->base.zpos;
+ mdp5_state = kzalloc(sizeof(*mdp5_state), GFP_KERNEL);
+ if (mdp5_state) {
+ if (plane->type == DRM_PLANE_TYPE_PRIMARY)
+ mdp5_state->base.zpos = STAGE_BASE;
+ else
+ mdp5_state->base.zpos = STAGE0 + drm_plane_index(plane);
+ mdp5_state->base.normalized_zpos = mdp5_state->base.zpos;
- __drm_atomic_helper_plane_reset(plane, &mdp5_state->base);
+ __drm_atomic_helper_plane_reset(plane, &mdp5_state->base);
+ }
}
static struct drm_plane_state *
--
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] drm/msm/mdp5: check the return of kzalloc()
2022-03-24 8:36 ` xkernel.wang
@ 2022-03-24 17:58 ` Abhinav Kumar
-1 siblings, 0 replies; 6+ messages in thread
From: Abhinav Kumar @ 2022-03-24 17:58 UTC (permalink / raw)
To: xkernel.wang, robdclark, sean, airlied, daniel
Cc: linux-arm-msm, freedreno, linux-kernel, dri-devel
On 3/24/2022 1:36 AM, xkernel.wang@foxmail.com wrote:
> From: Xiaoke Wang <xkernel.wang@foxmail.com>
>
> kzalloc() is a memory allocation function which can return NULL when
> some internal memory errors happen. So it is better to check it to
> prevent potential wrong memory access.
>
> Signed-off-by: Xiaoke Wang <xkernel.wang@foxmail.com>
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
> ---
> drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 17 ++++++++++-------
> 1 file changed, 10 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
> index c6b69af..5f914cc 100644
> --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
> +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
> @@ -90,15 +90,18 @@ static void mdp5_plane_reset(struct drm_plane *plane)
> __drm_atomic_helper_plane_destroy_state(plane->state);
>
> kfree(to_mdp5_plane_state(plane->state));
> - mdp5_state = kzalloc(sizeof(*mdp5_state), GFP_KERNEL);
> + plane->state = NULL;
>
> - if (plane->type == DRM_PLANE_TYPE_PRIMARY)
> - mdp5_state->base.zpos = STAGE_BASE;
> - else
> - mdp5_state->base.zpos = STAGE0 + drm_plane_index(plane);
> - mdp5_state->base.normalized_zpos = mdp5_state->base.zpos;
> + mdp5_state = kzalloc(sizeof(*mdp5_state), GFP_KERNEL);
> + if (mdp5_state) {
> + if (plane->type == DRM_PLANE_TYPE_PRIMARY)
> + mdp5_state->base.zpos = STAGE_BASE;
> + else
> + mdp5_state->base.zpos = STAGE0 + drm_plane_index(plane);
> + mdp5_state->base.normalized_zpos = mdp5_state->base.zpos;
>
> - __drm_atomic_helper_plane_reset(plane, &mdp5_state->base);
> + __drm_atomic_helper_plane_reset(plane, &mdp5_state->base);
> + }
> }
>
> static struct drm_plane_state *
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] drm/msm/mdp5: check the return of kzalloc()
@ 2022-03-24 17:58 ` Abhinav Kumar
0 siblings, 0 replies; 6+ messages in thread
From: Abhinav Kumar @ 2022-03-24 17:58 UTC (permalink / raw)
To: xkernel.wang, robdclark, sean, airlied, daniel
Cc: linux-arm-msm, freedreno, linux-kernel, dri-devel
On 3/24/2022 1:36 AM, xkernel.wang@foxmail.com wrote:
> From: Xiaoke Wang <xkernel.wang@foxmail.com>
>
> kzalloc() is a memory allocation function which can return NULL when
> some internal memory errors happen. So it is better to check it to
> prevent potential wrong memory access.
>
> Signed-off-by: Xiaoke Wang <xkernel.wang@foxmail.com>
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
> ---
> drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 17 ++++++++++-------
> 1 file changed, 10 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
> index c6b69af..5f914cc 100644
> --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
> +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
> @@ -90,15 +90,18 @@ static void mdp5_plane_reset(struct drm_plane *plane)
> __drm_atomic_helper_plane_destroy_state(plane->state);
>
> kfree(to_mdp5_plane_state(plane->state));
> - mdp5_state = kzalloc(sizeof(*mdp5_state), GFP_KERNEL);
> + plane->state = NULL;
>
> - if (plane->type == DRM_PLANE_TYPE_PRIMARY)
> - mdp5_state->base.zpos = STAGE_BASE;
> - else
> - mdp5_state->base.zpos = STAGE0 + drm_plane_index(plane);
> - mdp5_state->base.normalized_zpos = mdp5_state->base.zpos;
> + mdp5_state = kzalloc(sizeof(*mdp5_state), GFP_KERNEL);
> + if (mdp5_state) {
> + if (plane->type == DRM_PLANE_TYPE_PRIMARY)
> + mdp5_state->base.zpos = STAGE_BASE;
> + else
> + mdp5_state->base.zpos = STAGE0 + drm_plane_index(plane);
> + mdp5_state->base.normalized_zpos = mdp5_state->base.zpos;
>
> - __drm_atomic_helper_plane_reset(plane, &mdp5_state->base);
> + __drm_atomic_helper_plane_reset(plane, &mdp5_state->base);
> + }
> }
>
> static struct drm_plane_state *
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/msm/mdp5: check the return of kzalloc()
2022-03-24 8:36 ` xkernel.wang
@ 2022-04-06 16:24 ` Rob Clark
-1 siblings, 0 replies; 6+ messages in thread
From: Rob Clark @ 2022-04-06 16:24 UTC (permalink / raw)
To: xkernel.wang
Cc: Sean Paul, David Airlie, linux-arm-msm,
Linux Kernel Mailing List, dri-devel, freedreno
On Thu, Mar 24, 2022 at 1:37 AM <xkernel.wang@foxmail.com> wrote:
>
> From: Xiaoke Wang <xkernel.wang@foxmail.com>
>
> kzalloc() is a memory allocation function which can return NULL when
> some internal memory errors happen. So it is better to check it to
> prevent potential wrong memory access.
>
> Signed-off-by: Xiaoke Wang <xkernel.wang@foxmail.com>
> ---
> drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 17 ++++++++++-------
> 1 file changed, 10 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
> index c6b69af..5f914cc 100644
> --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
> +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
> @@ -90,15 +90,18 @@ static void mdp5_plane_reset(struct drm_plane *plane)
> __drm_atomic_helper_plane_destroy_state(plane->state);
>
> kfree(to_mdp5_plane_state(plane->state));
> - mdp5_state = kzalloc(sizeof(*mdp5_state), GFP_KERNEL);
> + plane->state = NULL;
At this point, you could just:
if (!mdp5_state)
return;
BR,
-R
>
> - if (plane->type == DRM_PLANE_TYPE_PRIMARY)
> - mdp5_state->base.zpos = STAGE_BASE;
> - else
> - mdp5_state->base.zpos = STAGE0 + drm_plane_index(plane);
> - mdp5_state->base.normalized_zpos = mdp5_state->base.zpos;
> + mdp5_state = kzalloc(sizeof(*mdp5_state), GFP_KERNEL);
> + if (mdp5_state) {
> + if (plane->type == DRM_PLANE_TYPE_PRIMARY)
> + mdp5_state->base.zpos = STAGE_BASE;
> + else
> + mdp5_state->base.zpos = STAGE0 + drm_plane_index(plane);
> + mdp5_state->base.normalized_zpos = mdp5_state->base.zpos;
>
> - __drm_atomic_helper_plane_reset(plane, &mdp5_state->base);
> + __drm_atomic_helper_plane_reset(plane, &mdp5_state->base);
> + }
> }
>
> static struct drm_plane_state *
> --
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] drm/msm/mdp5: check the return of kzalloc()
@ 2022-04-06 16:24 ` Rob Clark
0 siblings, 0 replies; 6+ messages in thread
From: Rob Clark @ 2022-04-06 16:24 UTC (permalink / raw)
To: xkernel.wang
Cc: Sean Paul, David Airlie, Daniel Vetter, linux-arm-msm, dri-devel,
freedreno, Linux Kernel Mailing List
On Thu, Mar 24, 2022 at 1:37 AM <xkernel.wang@foxmail.com> wrote:
>
> From: Xiaoke Wang <xkernel.wang@foxmail.com>
>
> kzalloc() is a memory allocation function which can return NULL when
> some internal memory errors happen. So it is better to check it to
> prevent potential wrong memory access.
>
> Signed-off-by: Xiaoke Wang <xkernel.wang@foxmail.com>
> ---
> drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 17 ++++++++++-------
> 1 file changed, 10 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
> index c6b69af..5f914cc 100644
> --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
> +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
> @@ -90,15 +90,18 @@ static void mdp5_plane_reset(struct drm_plane *plane)
> __drm_atomic_helper_plane_destroy_state(plane->state);
>
> kfree(to_mdp5_plane_state(plane->state));
> - mdp5_state = kzalloc(sizeof(*mdp5_state), GFP_KERNEL);
> + plane->state = NULL;
At this point, you could just:
if (!mdp5_state)
return;
BR,
-R
>
> - if (plane->type == DRM_PLANE_TYPE_PRIMARY)
> - mdp5_state->base.zpos = STAGE_BASE;
> - else
> - mdp5_state->base.zpos = STAGE0 + drm_plane_index(plane);
> - mdp5_state->base.normalized_zpos = mdp5_state->base.zpos;
> + mdp5_state = kzalloc(sizeof(*mdp5_state), GFP_KERNEL);
> + if (mdp5_state) {
> + if (plane->type == DRM_PLANE_TYPE_PRIMARY)
> + mdp5_state->base.zpos = STAGE_BASE;
> + else
> + mdp5_state->base.zpos = STAGE0 + drm_plane_index(plane);
> + mdp5_state->base.normalized_zpos = mdp5_state->base.zpos;
>
> - __drm_atomic_helper_plane_reset(plane, &mdp5_state->base);
> + __drm_atomic_helper_plane_reset(plane, &mdp5_state->base);
> + }
> }
>
> static struct drm_plane_state *
> --
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-04-06 17:46 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-24 8:36 [PATCH] drm/msm/mdp5: check the return of kzalloc() xkernel.wang
2022-03-24 8:36 ` xkernel.wang
2022-03-24 17:58 ` Abhinav Kumar
2022-03-24 17:58 ` Abhinav Kumar
2022-04-06 16:24 ` Rob Clark
2022-04-06 16:24 ` Rob Clark
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.