Skip to content

Commit

Permalink
drm/client: Fix double free in error path
Browse files Browse the repository at this point in the history
This fixes a static checker warning:

	drivers/gpu/drm/drm_client.c:289 drm_client_buffer_create()
	error: double free of 'buffer'

Extend drm_client_buffer_delete() to handle the case when there's no
dumb buffer attached and drop the extra kfree.

Fixes: c76f0f7cb546 ("drm: Begin an API for in-kernel clients")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Patch-mainline: 20180712150414.46908-1-noralf@tronnes.org @ 12/07/18, 03:04 p.m.
Link: https://patchwork.freedesktop.org/patch/msgid/20180712150414.46908-1-noralf@tronnes.org

Change-Id: I21aed9d7b052b7f804100a70c50532385255acf3
Signed-off-by: Shubham Talekar <stalek@codeaurora.org>
  • Loading branch information
notro authored and Gerrit - the friendly Code Review server committed Sep 27, 2021
1 parent 8ef7d13 commit 154661a
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions drivers/gpu/drm/drm_client.c
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,8 @@ static void drm_client_buffer_delete(struct drm_client_buffer *buffer)
if (buffer->gem)
drm_gem_object_unreference_unlocked(buffer->gem);

drm_mode_destroy_dumb(dev, buffer->handle, buffer->client->file);
if (buffer->handle)
drm_mode_destroy_dumb(dev, buffer->handle, buffer->client->file);
kfree(buffer);
}

Expand All @@ -238,7 +239,7 @@ drm_client_buffer_create(struct drm_client_dev *client, u32 width, u32 height, u
dumb_args.bpp = drm_format_plane_cpp(format, 0) * 8;
ret = drm_mode_create_dumb(dev, &dumb_args, client->file);
if (ret)
goto err_free;
goto err_delete;

buffer->handle = dumb_args.handle;
buffer->pitch = dumb_args.pitch;
Expand Down Expand Up @@ -271,8 +272,6 @@ drm_client_buffer_create(struct drm_client_dev *client, u32 width, u32 height, u

err_delete:
drm_client_buffer_delete(buffer);
err_free:
kfree(buffer);

return ERR_PTR(ret);
}
Expand Down

0 comments on commit 154661a

Please sign in to comment.