lkml.org 
[lkml]   [2021]   [Dec]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 022/106] drm/vc4: fix error code in vc4_create_object()
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    [ Upstream commit 96c5f82ef0a145d3e56e5b26f2bf6dcd2ffeae1c ]

    The ->gem_create_object() functions are supposed to return NULL if there
    is an error. None of the callers expect error pointers so returing one
    will lead to an Oops. See drm_gem_vram_create(), for example.

    Fixes: c826a6e10644 ("drm/vc4: Add a BO cache.")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Maxime Ripard <maxime@cerno.tech>
    Link: https://patchwork.freedesktop.org/patch/msgid/20211118111416.GC1147@kili
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/vc4/vc4_bo.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/gpu/drm/vc4/vc4_bo.c b/drivers/gpu/drm/vc4/vc4_bo.c
    index eff0a8ece8bcf..85abba74ed981 100644
    --- a/drivers/gpu/drm/vc4/vc4_bo.c
    +++ b/drivers/gpu/drm/vc4/vc4_bo.c
    @@ -292,7 +292,7 @@ struct drm_gem_object *vc4_create_object(struct drm_device *dev, size_t size)

    bo = kzalloc(sizeof(*bo), GFP_KERNEL);
    if (!bo)
    - return ERR_PTR(-ENOMEM);
    + return NULL;

    mutex_lock(&vc4->bo_lock);
    bo->label = VC4_BO_TYPE_KERNEL;
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-12-06 16:09    [W:3.289 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site