| From 0747eaf907a7057aac406e93e01dd75c4b2500f9 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 13 Oct 2021 11:13:15 +0300 |
| Subject: drm/msm: uninitialized variable in msm_gem_import() |
| |
| From: Dan Carpenter <dan.carpenter@oracle.com> |
| |
| [ Upstream commit 2203bd0e5c12ffc53ffdd4fbd7b12d6ba27e0424 ] |
| |
| The msm_gem_new_impl() function cleans up after itself so there is no |
| need to call drm_gem_object_put(). Conceptually, it does not make sense |
| to call a kref_put() function until after the reference counting has |
| been initialized which happens immediately after this call in the |
| drm_gem_(private_)object_init() functions. |
| |
| In the msm_gem_import() function the "obj" pointer is uninitialized, so |
| it will lead to a crash. |
| |
| Fixes: 05b849111c07 ("drm/msm: prime support") |
| Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> |
| Link: https://lore.kernel.org/r/20211013081315.GG6010@kili |
| Signed-off-by: Rob Clark <robdclark@chromium.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/gpu/drm/msm/msm_gem.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c |
| index d92a0ffe2a767..8e6a4d5f3a405 100644 |
| --- a/drivers/gpu/drm/msm/msm_gem.c |
| +++ b/drivers/gpu/drm/msm/msm_gem.c |
| @@ -1036,7 +1036,7 @@ static struct drm_gem_object *_msm_gem_new(struct drm_device *dev, |
| |
| ret = msm_gem_new_impl(dev, size, flags, &obj); |
| if (ret) |
| - goto fail; |
| + return ERR_PTR(ret); |
| |
| msm_obj = to_msm_bo(obj); |
| |
| @@ -1124,7 +1124,7 @@ struct drm_gem_object *msm_gem_import(struct drm_device *dev, |
| |
| ret = msm_gem_new_impl(dev, size, MSM_BO_WC, &obj); |
| if (ret) |
| - goto fail; |
| + return ERR_PTR(ret); |
| |
| drm_gem_private_object_init(dev, obj, size); |
| |
| -- |
| 2.33.0 |
| |