blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1522 from emersion/logind-no-dup-leak 

backend/session/logind: dup FD with CLOEXEC
This commit is contained in:
Drew DeVault 2019-02-01 09:28:36 +01:00 committed by GitHub
parent 2d65d49c5c 22faddde9e
commit d2f0efd3f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backend/session/logind.c
View File

@ -294,7 +294,8 @@ error:
return 0; return 0;
} }
static int resume_device(sd_bus_message *msg, void *userdata, sd_bus_error *ret_error) { static int resume_device(sd_bus_message *msg, void *userdata,
sd_bus_error *ret_error) {
struct logind_session *session = userdata; struct logind_session *session = userdata;
int ret; int ret;
@ -309,7 +310,12 @@ static int resume_device(sd_bus_message *msg, void *userdata, sd_bus_error *ret_
if (major == DRM_MAJOR) { if (major == DRM_MAJOR) {
struct wlr_device *dev = find_device(&session->base, makedev(major, minor)); struct wlr_device *dev = find_device(&session->base, makedev(major, minor));
dup2(fd, dev->fd);
close(dev->fd);
if (fcntl(fd, F_DUPFD_CLOEXEC, dev->fd) < 0) {
wlr_log_errno(WLR_ERROR, "Failed to duplicate file descriptor");
goto error;
}
if (!session->base.active) { if (!session->base.active) {
session->base.active = true; session->base.active = true;