[PATCH weston] logind: actually close fd in launcher_logind_close

Pekka Paalanen ppaalanen at gmail.com
Wed Jul 26 15:04:19 UTC 2017


On Tue, 25 Jul 2017 16:17:36 -0500
Derek Foreman <derekf at osg.samsung.com> wrote:

> We still need to close fds passed to us - or we leak quite a few fds
> on VC switch.
> 
> Regression, originally fixed in 8f5acc2f3a29c3831af4ddd6bed57f703c98dc77
> and re-broken in commit 72dea06d7952e3ce8dd8057f7106186da4fa2678
> but only for the logind launcher.
> 
> Signed-off-by: Derek Foreman <derekf at osg.samsung.com>
> ---
>  libweston/launcher-logind.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/libweston/launcher-logind.c b/libweston/launcher-logind.c
> index f10a2831..a069bd4f 100644
> --- a/libweston/launcher-logind.c
> +++ b/libweston/launcher-logind.c
> @@ -216,6 +216,7 @@ launcher_logind_close(struct weston_launcher *launcher, int fd)
>  	int r;
>  
>  	r = fstat(fd, &st);
> +	close(fd);
>  	if (r < 0) {
>  		weston_log("logind: cannot fstat fd: %m\n");
>  		return;

Reviewed-by: Pekka Paalanen <pekka.paalanen at collabora.co.uk>

But I didn't push this yet, because I probably hit an unrelated issue
with VT switching in the DRM backend, and will need to test more.


Thanks,
pq
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/wayland-devel/attachments/20170726/c5120f54/attachment.sig>


More information about the wayland-devel mailing list