itycodes
/
wlseeds
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pass O_CLOEXEC to drmModeCreateLease calls

Browse Source 
The lease_fd is currently being leaked to child processes

Link: https://github.com/swaywm/sway/issues/4286#issuecomment-1065987957
master
Samuel Čavoj 3 years ago
parent 4c8ecfcd4a
commit 5c17452ae0
No known key found for this signature in database
GPG Key ID: 5DFA998B099F923F
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File

2
backend/drm/drm.c
Unescape View File

@ -1629,7 +1629,7 @@ struct wlr_drm_lease *wlr_drm_create_lease(struct wlr_output **outputs,
wl_signal_init(&lease->events.destroy); wl_signal_init(&lease->events.destroy);
wlr_log(WLR_DEBUG, "Issuing DRM lease with %d objects", n_objects); wlr_log(WLR_DEBUG, "Issuing DRM lease with %d objects", n_objects);
int lease_fd = drmModeCreateLease(drm->fd, objects, n_objects, 0, int lease_fd = drmModeCreateLease(drm->fd, objects, n_objects, O_CLOEXEC,
&lease->lessee_id); &lease->lessee_id);
if (lease_fd < 0) { if (lease_fd < 0) {
free(lease); free(lease);

2
render/allocator/allocator.c
Unescape View File

@ -30,7 +30,7 @@ static int reopen_drm_node(int drm_fd, bool allow_render_node) {
if (drmIsMaster(drm_fd)) { if (drmIsMaster(drm_fd)) {
// Only recent kernels support empty leases // Only recent kernels support empty leases
uint32_t lessee_id; uint32_t lessee_id;
int lease_fd = drmModeCreateLease(drm_fd, NULL, 0, 0, &lessee_id); int lease_fd = drmModeCreateLease(drm_fd, NULL, 0, O_CLOEXEC, &lessee_id);
if (lease_fd >= 0) { if (lease_fd >= 0) {
return lease_fd; return lease_fd;
} else if (lease_fd != -EINVAL && lease_fd != -EOPNOTSUPP) { } else if (lease_fd != -EINVAL && lease_fd != -EOPNOTSUPP) {

Write Preview
Loading…
Cancel
Save