diff options
author | David Fries <[email protected]> | 2011-12-10 11:28:45 -0600 |
---|---|---|
committer | Dave Airlie <[email protected]> | 2012-03-11 19:05:50 +0000 |
commit | b60120608f6ddf4098bc324363197c979ee04cb7 (patch) | |
tree | f3757427a0e19359662ede905bfb90359f5fec2d /src/gallium/state_trackers/egl/wayland | |
parent | 5ea18503e757ceeb9eba32a72fdf02b7bc710275 (diff) |
Set close on exec flag FD_CLOEXEC
Set the close on exec flag when opening dri character devices, so they
will be closed and free any resouces allocated in exec.
Signed-off-by: David Fries <[email protected]>
Reviewed-by: Adam Jackson <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src/gallium/state_trackers/egl/wayland')
-rw-r--r-- | src/gallium/state_trackers/egl/wayland/native_drm.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/gallium/state_trackers/egl/wayland/native_drm.c b/src/gallium/state_trackers/egl/wayland/native_drm.c index 8daf7830dd4..e3bd628675e 100644 --- a/src/gallium/state_trackers/egl/wayland/native_drm.c +++ b/src/gallium/state_trackers/egl/wayland/native_drm.c @@ -133,7 +133,15 @@ drm_handle_device(void *data, struct wl_drm *drm, const char *device) if (!drmdpy->device_name) return; - drmdpy->fd = open(drmdpy->device_name, O_RDWR); +#ifdef O_CLOEXEC + drmdpy->fd = open(drmdpy->device_name, O_RDWR | O_CLOEXEC); + if (drmdpy->fd == -1 && errno == EINVAL) +#endif + { + drmdpy->fd = open(drmdpy->device_name, O_RDWR); + if (drmdpy->fd != -1) + fcntl(drmdpy->fd, F_SETFD, fcntl(drmdpy->fd, F_GETFD) | FD_CLOEXEC); + } if (drmdpy->fd == -1) { _eglLog(_EGL_WARNING, "wayland-egl: could not open %s (%s)", drmdpy->device_name, strerror(errno)); |