Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f527e3e authored by Zack Rusin's avatar Zack Rusin Committed by Greg Kroah-Hartman
Browse files

drm/vmwgfx: Fix invalid reads in fence signaled events 



commit a37ef7613c00f2d72c8fc08bd83fb6cc76926c8c upstream.

Correctly set the length of the drm_event to the size of the structure
that's actually used.

The length of the drm_event was set to the parent structure instead of
to the drm_vmw_event_fence which is supposed to be read. drm_read
uses the length parameter to copy the event to the user space thus
resuling in oob reads.

Signed-off-by: default avatarZack Rusin <zack.rusin@broadcom.com>
Fixes: 8b7de6aa ("vmwgfx: Rework fence event action")
Reported-by: zdi-disclosures@trendmicro.com # ZDI-CAN-23566
Cc: David Airlie <airlied@gmail.com>
CC: Daniel Vetter <daniel@ffwll.ch>
Cc: Zack Rusin <zack.rusin@broadcom.com>
Cc: Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
Cc: dri-devel@lists.freedesktop.org
Cc: linux-kernel@vger.kernel.org
Cc: <stable@vger.kernel.org> # v3.4+
Reviewed-by: default avatarMaaz Mombasawala <maaz.mombasawala@broadcom.com>
Reviewed-by: default avatarMartin Krastev <martin.krastev@broadcom.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240425192748.1761522-1-zack.rusin@broadcom.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3c718bdd

drivers/gpu/drm/vmwgfx/vmwgfx_fence.c

+1 −1
Original line number Diff line number Diff line
@@ -1064,7 +1064,7 @@ static int vmw_event_fence_action_create(struct drm_file *file_priv, 
	}



	event->event.base.type = DRM_VMW_EVENT_FENCE_SIGNALED;

	event->event.base.length = sizeof(*event);

	event->event.base.length = sizeof(event->event);

	event->event.user_data = user_data;



	ret = drm_event_reserve_init(dev, file_priv, &event->base, &event->event.base);