[PATCH libdrm] amdgpu: make sure to set CLOEXEC on duplicated FDs

Michel Dänzer michel at daenzer.net
Tue Jul 17 09:19:31 UTC 2018


On 2018-07-17 11:04 AM, Christian König wrote:
> Otherwise we leak file descriptors into child processes.
> 
> Signed-off-by: Christian König <christian.koenig at amd.com>
> ---
>  amdgpu/amdgpu_device.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/amdgpu/amdgpu_device.c b/amdgpu/amdgpu_device.c
> index 34ac95b8..d7aec6a4 100644
> --- a/amdgpu/amdgpu_device.c
> +++ b/amdgpu/amdgpu_device.c
> @@ -34,6 +34,7 @@
>  #include <stdio.h>
>  #include <stdlib.h>
>  #include <unistd.h>
> +#include <fcntl.h>
>  
>  #include "xf86drm.h"
>  #include "amdgpu_drm.h"
> @@ -205,7 +206,7 @@ int amdgpu_device_initialize(int fd,
>  			return r;
>  		}
>  		if ((flag_auth) && (!flag_authexist)) {
> -			dev->flink_fd = dup(fd);
> +			dev->flink_fd = fcntl(fd, F_DUPFD_CLOEXEC, 0);
>  		}
>  		*major_version = dev->major_version;
>  		*minor_version = dev->minor_version;
> @@ -239,7 +240,7 @@ int amdgpu_device_initialize(int fd,
>  		goto cleanup;
>  	}
>  
> -	dev->fd = dup(fd);
> +	dev->fd = fcntl(fd, F_DUPFD_CLOEXEC, 0);
>  	dev->flink_fd = dev->fd;
>  	dev->major_version = version->version_major;
>  	dev->minor_version = version->version_minor;
> 

Nice catch.

Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>


-- 
Earthling Michel Dänzer               |               http://www.amd.com
Libre software enthusiast             |             Mesa and X developer


More information about the amd-gfx mailing list