Commit 4f160d8d authored by Chris Wilson's avatar Chris Wilson Committed by Greg Kroah-Hartman

drm: Reorder set_property_atomic to avoid returning with an active ww_ctx

commit 227ad6d957898a88b1746e30234ece64d305f066 upstream.

Delay the drm_modeset_acquire_init() until after we check for an
allocation failure so that we can return immediately upon error without
having to unwind.

WARNING: lock held when returning to user space!
4.20.0+ #174 Not tainted
syz-executor556/8153 is leaving the kernel with locks still held!
1 lock held by syz-executor556/8153:
  #0: 000000005100c85c (crtc_ww_class_acquire){+.+.}, at:
set_property_atomic+0xb3/0x330 drivers/gpu/drm/drm_mode_object.c:462

Fixes: 144a7999 ("drm: Handle properties in the core for atomic drivers")
Signed-off-by: default avatarChris Wilson <>
Cc: Daniel Vetter <>
Cc: Maarten Lankhorst <>
Cc: Sean Paul <>
Cc: David Airlie <>
Cc: <> # v4.14+
Reviewed-by: default avatarMaarten Lankhorst <>
Link: default avatarGreg Kroah-Hartman <>
parent a1dbb34d
......@@ -432,12 +432,13 @@ static int set_property_atomic(struct drm_mode_object *obj,
struct drm_modeset_acquire_ctx ctx;
int ret;
drm_modeset_acquire_init(&ctx, 0);
state = drm_atomic_state_alloc(dev);
if (!state)
return -ENOMEM;
drm_modeset_acquire_init(&ctx, 0);
state->acquire_ctx = &ctx;
if (prop == state->dev->mode_config.dpms_property) {
if (obj->type != DRM_MODE_OBJECT_CONNECTOR) {
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment