Skip to content

Commit 8c7c44b

Browse files
T.J. MercierChristianKoenigAMD
authored andcommitted
drm/syncobj: Fix syncobj leak in drm_syncobj_eventfd_ioctl
A syncobj reference is taken in drm_syncobj_find, but not released if eventfd_ctx_fdget or kzalloc fails. Put the reference in these error paths. Reported-by: Xingyu Jin <xingyuj@google.com> Fixes: c7a4722 ("drm/syncobj: add IOCTL to register an eventfd") Signed-off-by: T.J. Mercier <tjmercier@google.com> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@igalia.com> Reviewed-by. Christian König <christian.koenig@amd.com> CC: stable@vger.kernel.org # 6.6+ Link: https://patchwork.freedesktop.org/patch/msgid/20240909205400.3498337-1-tjmercier@google.com Signed-off-by: Christian König <christian.koenig@amd.com>
1 parent 7b56517 commit 8c7c44b

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

drivers/gpu/drm/drm_syncobj.c

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1464,6 +1464,7 @@ drm_syncobj_eventfd_ioctl(struct drm_device *dev, void *data,
14641464
struct drm_syncobj *syncobj;
14651465
struct eventfd_ctx *ev_fd_ctx;
14661466
struct syncobj_eventfd_entry *entry;
1467+
int ret;
14671468

14681469
if (!drm_core_check_feature(dev, DRIVER_SYNCOBJ_TIMELINE))
14691470
return -EOPNOTSUPP;
@@ -1479,13 +1480,15 @@ drm_syncobj_eventfd_ioctl(struct drm_device *dev, void *data,
14791480
return -ENOENT;
14801481

14811482
ev_fd_ctx = eventfd_ctx_fdget(args->fd);
1482-
if (IS_ERR(ev_fd_ctx))
1483-
return PTR_ERR(ev_fd_ctx);
1483+
if (IS_ERR(ev_fd_ctx)) {
1484+
ret = PTR_ERR(ev_fd_ctx);
1485+
goto err_fdget;
1486+
}
14841487

14851488
entry = kzalloc(sizeof(*entry), GFP_KERNEL);
14861489
if (!entry) {
1487-
eventfd_ctx_put(ev_fd_ctx);
1488-
return -ENOMEM;
1490+
ret = -ENOMEM;
1491+
goto err_kzalloc;
14891492
}
14901493
entry->syncobj = syncobj;
14911494
entry->ev_fd_ctx = ev_fd_ctx;
@@ -1496,6 +1499,12 @@ drm_syncobj_eventfd_ioctl(struct drm_device *dev, void *data,
14961499
drm_syncobj_put(syncobj);
14971500

14981501
return 0;
1502+
1503+
err_kzalloc:
1504+
eventfd_ctx_put(ev_fd_ctx);
1505+
err_fdget:
1506+
drm_syncobj_put(syncobj);
1507+
return ret;
14991508
}
15001509

15011510
int

0 commit comments

Comments
 (0)