[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20240425192748.1761522-1-zack.rusin@broadcom.com>
Date: Thu, 25 Apr 2024 15:27:48 -0400
From: Zack Rusin <zack.rusin@...adcom.com>
To: dri-devel@...ts.freedesktop.org
Cc: Broadcom internal kernel review list <bcm-kernel-feedback-list@...adcom.com>,
ian.forbes@...adcom.com,
martin.krastev@...adcom.com,
maaz.mombasawala@...adcom.com,
Zack Rusin <zack.rusin@...adcom.com>,
zdi-disclosures@...ndmicro.com,
David Airlie <airlied@...il.com>,
Daniel Vetter <daniel@...ll.ch>,
linux-kernel@...r.kernel.org,
stable@...r.kernel.org
Subject: [PATCH] drm/vmwgfx: Fix invalid reads in fence signaled events
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: Zack Rusin <zack.rusin@...adcom.com>
Fixes: 8b7de6aa8468 ("vmwgfx: Rework fence event action")
Reported-by: zdi-disclosures@...ndmicro.com # ZDI-CAN-23566
Cc: David Airlie <airlied@...il.com>
CC: Daniel Vetter <daniel@...ll.ch>
Cc: Zack Rusin <zack.rusin@...adcom.com>
Cc: Broadcom internal kernel review list <bcm-kernel-feedback-list@...adcom.com>
Cc: dri-devel@...ts.freedesktop.org
Cc: linux-kernel@...r.kernel.org
Cc: <stable@...r.kernel.org> # v3.4+
---
drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
index 2a0cda324703..5efc6a766f64 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
@@ -991,7 +991,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);
--
2.40.1
Powered by blists - more mailing lists