* [PATCH] drm/msm: Fix potential invalid ptr free
@ 2023-02-15 23:50 Rob Clark
2023-02-16 16:41 ` Dmitry Baryshkov
2023-02-16 17:16 ` Dmitry Osipenko
0 siblings, 2 replies; 3+ messages in thread
From: Rob Clark @ 2023-02-15 23:50 UTC (permalink / raw)
To: dri-devel
Cc: freedreno, linux-arm-msm, Rob Clark, Rob Clark, Abhinav Kumar,
Dmitry Baryshkov, Sean Paul, David Airlie, Daniel Vetter,
Bas Nieuwenhuizen, Jordan Crouse, open list
From: Rob Clark <robdclark@chromium.org>
The error path cleanup expects that chain and syncobj are either NULL or
valid pointers. But post_deps was not allocated with __GFP_ZERO.
Fixes: ab723b7a992a ("drm/msm: Add syncobj support.")
Signed-off-by: Rob Clark <robdclark@chromium.org>
---
drivers/gpu/drm/msm/msm_gem_submit.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm_gem_submit.c
index 6503220e5a4b..e4d13540300e 100644
--- a/drivers/gpu/drm/msm/msm_gem_submit.c
+++ b/drivers/gpu/drm/msm/msm_gem_submit.c
@@ -640,8 +640,8 @@ static struct msm_submit_post_dep *msm_parse_post_deps(struct drm_device *dev,
int ret = 0;
uint32_t i, j;
- post_deps = kmalloc_array(nr_syncobjs, sizeof(*post_deps),
- GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY);
+ post_deps = kcalloc(nr_syncobjs, sizeof(*post_deps),
+ GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY);
if (!post_deps)
return ERR_PTR(-ENOMEM);
@@ -656,7 +656,6 @@ static struct msm_submit_post_dep *msm_parse_post_deps(struct drm_device *dev,
}
post_deps[i].point = syncobj_desc.point;
- post_deps[i].chain = NULL;
if (syncobj_desc.flags) {
ret = -EINVAL;
--
2.39.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] drm/msm: Fix potential invalid ptr free
2023-02-15 23:50 [PATCH] drm/msm: Fix potential invalid ptr free Rob Clark
@ 2023-02-16 16:41 ` Dmitry Baryshkov
2023-02-16 17:16 ` Dmitry Osipenko
1 sibling, 0 replies; 3+ messages in thread
From: Dmitry Baryshkov @ 2023-02-16 16:41 UTC (permalink / raw)
To: Rob Clark, dri-devel
Cc: freedreno, linux-arm-msm, Rob Clark, Abhinav Kumar, Sean Paul,
David Airlie, Daniel Vetter, Bas Nieuwenhuizen, Jordan Crouse,
open list
On 16/02/2023 01:50, Rob Clark wrote:
> From: Rob Clark <robdclark@chromium.org>
>
> The error path cleanup expects that chain and syncobj are either NULL or
> valid pointers. But post_deps was not allocated with __GFP_ZERO.
>
> Fixes: ab723b7a992a ("drm/msm: Add syncobj support.")
> Signed-off-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
This makes me want to rewrite the ab723b7a992a ("drm/msm: Add syncobj
support.") in the usual explicit-error-path way. WDYT?
> ---
> drivers/gpu/drm/msm/msm_gem_submit.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm_gem_submit.c
> index 6503220e5a4b..e4d13540300e 100644
> --- a/drivers/gpu/drm/msm/msm_gem_submit.c
> +++ b/drivers/gpu/drm/msm/msm_gem_submit.c
> @@ -640,8 +640,8 @@ static struct msm_submit_post_dep *msm_parse_post_deps(struct drm_device *dev,
> int ret = 0;
> uint32_t i, j;
>
> - post_deps = kmalloc_array(nr_syncobjs, sizeof(*post_deps),
> - GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY);
> + post_deps = kcalloc(nr_syncobjs, sizeof(*post_deps),
> + GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY);
> if (!post_deps)
> return ERR_PTR(-ENOMEM);
>
> @@ -656,7 +656,6 @@ static struct msm_submit_post_dep *msm_parse_post_deps(struct drm_device *dev,
> }
>
> post_deps[i].point = syncobj_desc.point;
> - post_deps[i].chain = NULL;
>
> if (syncobj_desc.flags) {
> ret = -EINVAL;
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] drm/msm: Fix potential invalid ptr free
2023-02-15 23:50 [PATCH] drm/msm: Fix potential invalid ptr free Rob Clark
2023-02-16 16:41 ` Dmitry Baryshkov
@ 2023-02-16 17:16 ` Dmitry Osipenko
1 sibling, 0 replies; 3+ messages in thread
From: Dmitry Osipenko @ 2023-02-16 17:16 UTC (permalink / raw)
To: Rob Clark, dri-devel
Cc: Rob Clark, linux-arm-msm, Abhinav Kumar, Jordan Crouse, Sean Paul,
Dmitry Baryshkov, freedreno, open list
On 2/16/23 02:50, Rob Clark wrote:
> From: Rob Clark <robdclark@chromium.org>
>
> The error path cleanup expects that chain and syncobj are either NULL or
> valid pointers. But post_deps was not allocated with __GFP_ZERO.
>
> Fixes: ab723b7a992a ("drm/msm: Add syncobj support.")
> Signed-off-by: Rob Clark <robdclark@chromium.org>
> ---
> drivers/gpu/drm/msm/msm_gem_submit.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm_gem_submit.c
> index 6503220e5a4b..e4d13540300e 100644
> --- a/drivers/gpu/drm/msm/msm_gem_submit.c
> +++ b/drivers/gpu/drm/msm/msm_gem_submit.c
> @@ -640,8 +640,8 @@ static struct msm_submit_post_dep *msm_parse_post_deps(struct drm_device *dev,
> int ret = 0;
> uint32_t i, j;
>
> - post_deps = kmalloc_array(nr_syncobjs, sizeof(*post_deps),
> - GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY);
> + post_deps = kcalloc(nr_syncobjs, sizeof(*post_deps),
> + GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY);
> if (!post_deps)
> return ERR_PTR(-ENOMEM);
>
> @@ -656,7 +656,6 @@ static struct msm_submit_post_dep *msm_parse_post_deps(struct drm_device *dev,
> }
>
> post_deps[i].point = syncobj_desc.point;
> - post_deps[i].chain = NULL;
>
> if (syncobj_desc.flags) {
> ret = -EINVAL;
Good catch!
Reviewed-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
--
Best regards,
Dmitry
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-02-16 17:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-15 23:50 [PATCH] drm/msm: Fix potential invalid ptr free Rob Clark
2023-02-16 16:41 ` Dmitry Baryshkov
2023-02-16 17:16 ` Dmitry Osipenko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox