Skip to content

Commit ebe977a

Browse files
committed
drm/gem: Acquire references on GEM handles for framebuffers
jira VULN-136708 cve CVE-2025-38449 commit-author Thomas Zimmermann <[email protected]> commit 5307dce A GEM handle can be released while the GEM buffer object is attached to a DRM framebuffer. This leads to the release of the dma-buf backing the buffer object, if any. [1] Trying to use the framebuffer in further mode-setting operations leads to a segmentation fault. Most easily happens with driver that use shadow planes for vmap-ing the dma-buf during a page flip. An example is shown below. [ 156.791968] ------------[ cut here ]------------ [ 156.796830] WARNING: CPU: 2 PID: 2255 at drivers/dma-buf/dma-buf.c:1527 dma_buf_vmap+0x224/0x430 [...] [ 156.942028] RIP: 0010:dma_buf_vmap+0x224/0x430 [ 157.043420] Call Trace: [ 157.045898] <TASK> [ 157.048030] ? show_trace_log_lvl+0x1af/0x2c0 [ 157.052436] ? show_trace_log_lvl+0x1af/0x2c0 [ 157.056836] ? show_trace_log_lvl+0x1af/0x2c0 [ 157.061253] ? drm_gem_shmem_vmap+0x74/0x710 [ 157.065567] ? dma_buf_vmap+0x224/0x430 [ 157.069446] ? __warn.cold+0x58/0xe4 [ 157.073061] ? dma_buf_vmap+0x224/0x430 [ 157.077111] ? report_bug+0x1dd/0x390 [ 157.080842] ? handle_bug+0x5e/0xa0 [ 157.084389] ? exc_invalid_op+0x14/0x50 [ 157.088291] ? asm_exc_invalid_op+0x16/0x20 [ 157.092548] ? dma_buf_vmap+0x224/0x430 [ 157.096663] ? dma_resv_get_singleton+0x6d/0x230 [ 157.101341] ? __pfx_dma_buf_vmap+0x10/0x10 [ 157.105588] ? __pfx_dma_resv_get_singleton+0x10/0x10 [ 157.110697] drm_gem_shmem_vmap+0x74/0x710 [ 157.114866] drm_gem_vmap+0xa9/0x1b0 [ 157.118763] drm_gem_vmap_unlocked+0x46/0xa0 [ 157.123086] drm_gem_fb_vmap+0xab/0x300 [ 157.126979] drm_atomic_helper_prepare_planes.part.0+0x487/0xb10 [ 157.133032] ? lockdep_init_map_type+0x19d/0x880 [ 157.137701] drm_atomic_helper_commit+0x13d/0x2e0 [ 157.142671] ? drm_atomic_nonblocking_commit+0xa0/0x180 [ 157.147988] drm_mode_atomic_ioctl+0x766/0xe40 [...] [ 157.346424] ---[ end trace 0000000000000000 ]--- Acquiring GEM handles for the framebuffer's GEM buffer objects prevents this from happening. The framebuffer's cleanup later puts the handle references. Commit 1a148af ("drm/gem-shmem: Use dma_buf from GEM object instance") triggers the segmentation fault easily by using the dma-buf field more widely. The underlying issue with reference counting has been present before. v2: - acquire the handle instead of the BO (Christian) - fix comment style (Christian) - drop the Fixes tag (Christian) - rename err_ gotos - add missing Link tag Suggested-by: Christian König <[email protected]> Signed-off-by: Thomas Zimmermann <[email protected]> Link: https://elixir.bootlin.com/linux/v6.15/source/drivers/gpu/drm/drm_gem.c#L241 # [1] Cc: Thomas Zimmermann <[email protected]> Cc: Anusha Srivatsa <[email protected]> Cc: Christian König <[email protected]> Cc: Maarten Lankhorst <[email protected]> Cc: Maxime Ripard <[email protected]> Cc: Sumit Semwal <[email protected]> Cc: "Christian König" <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: <[email protected]> Reviewed-by: Christian König <[email protected]> Link: https://lore.kernel.org/r/[email protected] (cherry picked from commit 5307dce) Signed-off-by: Roxana Nicolescu <[email protected]>
1 parent b32d14b commit ebe977a

File tree

3 files changed

+51
-11
lines changed

3 files changed

+51
-11
lines changed

drivers/gpu/drm/drm_gem.c

Lines changed: 40 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,35 @@ void drm_gem_private_object_fini(struct drm_gem_object *obj)
186186
}
187187
EXPORT_SYMBOL(drm_gem_private_object_fini);
188188

189+
static void drm_gem_object_handle_get(struct drm_gem_object *obj)
190+
{
191+
struct drm_device *dev = obj->dev;
192+
193+
drm_WARN_ON(dev, !mutex_is_locked(&dev->object_name_lock));
194+
195+
if (obj->handle_count++ == 0)
196+
drm_gem_object_get(obj);
197+
}
198+
199+
/**
200+
* drm_gem_object_handle_get_unlocked - acquire reference on user-space handles
201+
* @obj: GEM object
202+
*
203+
* Acquires a reference on the GEM buffer object's handle. Required
204+
* to keep the GEM object alive. Call drm_gem_object_handle_put_unlocked()
205+
* to release the reference.
206+
*/
207+
void drm_gem_object_handle_get_unlocked(struct drm_gem_object *obj)
208+
{
209+
struct drm_device *dev = obj->dev;
210+
211+
guard(mutex)(&dev->object_name_lock);
212+
213+
drm_WARN_ON(dev, !obj->handle_count); /* first ref taken in create-tail helper */
214+
drm_gem_object_handle_get(obj);
215+
}
216+
EXPORT_SYMBOL(drm_gem_object_handle_get_unlocked);
217+
189218
/**
190219
* drm_gem_object_handle_free - release resources bound to userspace handles
191220
* @obj: GEM object to clean up.
@@ -216,8 +245,14 @@ static void drm_gem_object_exported_dma_buf_free(struct drm_gem_object *obj)
216245
}
217246
}
218247

219-
static void
220-
drm_gem_object_handle_put_unlocked(struct drm_gem_object *obj)
248+
/**
249+
* drm_gem_object_handle_put_unlocked - releases reference on user-space handles
250+
* @obj: GEM object
251+
*
252+
* Releases a reference on the GEM buffer object's handle. Possibly releases
253+
* the GEM buffer object and associated dma-buf objects.
254+
*/
255+
void drm_gem_object_handle_put_unlocked(struct drm_gem_object *obj)
221256
{
222257
struct drm_device *dev = obj->dev;
223258
bool final = false;
@@ -242,6 +277,7 @@ drm_gem_object_handle_put_unlocked(struct drm_gem_object *obj)
242277
if (final)
243278
drm_gem_object_put(obj);
244279
}
280+
EXPORT_SYMBOL(drm_gem_object_handle_put_unlocked);
245281

246282
/*
247283
* Called at device or object close to release the file's
@@ -363,8 +399,8 @@ drm_gem_handle_create_tail(struct drm_file *file_priv,
363399
int ret;
364400

365401
WARN_ON(!mutex_is_locked(&dev->object_name_lock));
366-
if (obj->handle_count++ == 0)
367-
drm_gem_object_get(obj);
402+
403+
drm_gem_object_handle_get(obj);
368404

369405
/*
370406
* Get the user-visible handle using idr. Preload and perform

drivers/gpu/drm/drm_gem_framebuffer_helper.c

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ void drm_gem_fb_destroy(struct drm_framebuffer *fb)
9999
unsigned int i;
100100

101101
for (i = 0; i < fb->format->num_planes; i++)
102-
drm_gem_object_put(fb->obj[i]);
102+
drm_gem_object_handle_put_unlocked(fb->obj[i]);
103103

104104
drm_framebuffer_cleanup(fb);
105105
kfree(fb);
@@ -182,8 +182,10 @@ int drm_gem_fb_init_with_funcs(struct drm_device *dev,
182182
if (!objs[i]) {
183183
drm_dbg_kms(dev, "Failed to lookup GEM object\n");
184184
ret = -ENOENT;
185-
goto err_gem_object_put;
185+
goto err_gem_object_handle_put_unlocked;
186186
}
187+
drm_gem_object_handle_get_unlocked(objs[i]);
188+
drm_gem_object_put(objs[i]);
187189

188190
min_size = (height - 1) * mode_cmd->pitches[i]
189191
+ drm_format_info_min_pitch(info, i, width)
@@ -193,22 +195,22 @@ int drm_gem_fb_init_with_funcs(struct drm_device *dev,
193195
drm_dbg_kms(dev,
194196
"GEM object size (%zu) smaller than minimum size (%u) for plane %d\n",
195197
objs[i]->size, min_size, i);
196-
drm_gem_object_put(objs[i]);
198+
drm_gem_object_handle_put_unlocked(objs[i]);
197199
ret = -EINVAL;
198-
goto err_gem_object_put;
200+
goto err_gem_object_handle_put_unlocked;
199201
}
200202
}
201203

202204
ret = drm_gem_fb_init(dev, fb, mode_cmd, objs, i, funcs);
203205
if (ret)
204-
goto err_gem_object_put;
206+
goto err_gem_object_handle_put_unlocked;
205207

206208
return 0;
207209

208-
err_gem_object_put:
210+
err_gem_object_handle_put_unlocked:
209211
while (i > 0) {
210212
--i;
211-
drm_gem_object_put(objs[i]);
213+
drm_gem_object_handle_put_unlocked(objs[i]);
212214
}
213215
return ret;
214216
}

drivers/gpu/drm/drm_internal.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,8 @@ void drm_sysfs_lease_event(struct drm_device *dev);
159159

160160
/* drm_gem.c */
161161
int drm_gem_init(struct drm_device *dev);
162+
void drm_gem_object_handle_get_unlocked(struct drm_gem_object *obj);
163+
void drm_gem_object_handle_put_unlocked(struct drm_gem_object *obj);
162164
int drm_gem_handle_create_tail(struct drm_file *file_priv,
163165
struct drm_gem_object *obj,
164166
u32 *handlep);

0 commit comments

Comments
 (0)