Commit 444bbba7 authored by Dmitry Osipenko's avatar Dmitry Osipenko
Browse files

drm/client: Prevent NULL dereference in drm_client_buffer_delete() 



The drm_gem_vunmap() will crash with a NULL dereference if the passed
object pointer is NULL. It wasn't a problem before we added the locking
support to drm_gem_vunmap function because the mapping argument was always
NULL together with the object. Make drm_client_buffer_delete() to check
whether GEM is NULL before trying to unmap the GEM, it will happen on
framebuffer creation error.

Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Link: https://lore.kernel.org/dri-devel/Y1kFEGxT8MVlf32V@kili/


Fixes: 79e2cf2e ("drm/gem: Take reservation lock for vmap/vunmap operations")
Signed-off-by: default avatarDmitry Osipenko <dmitry.osipenko@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221030154412.8320-3-dmitry.osipenko@collabora.com
parent d3292dae

drivers/gpu/drm/drm_client.c

+3 −3
Original line number Diff line number Diff line
@@ -235,10 +235,10 @@ static void drm_client_buffer_delete(struct drm_client_buffer *buffer) 
{

	struct drm_device *dev = buffer->client->dev;



	if (buffer->gem) {

		drm_gem_vunmap_unlocked(buffer->gem, &buffer->map);



	if (buffer->gem)

		drm_gem_object_put(buffer->gem);

	}



	if (buffer->handle)

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