libinput: Fix the close_restricted interface callback

libinput is supposed to take a close callback in its interface
to allow you to call out to a privileged API to close FDs. But
the FD that libinput passes you is bogus, because
libinput_remove_source closes the FD on which it's passed. This
is really bad, as the libinput_source really doesn't own the FD
which it's passed, so it shouldn't be trying to close() it.

Only one out of the four users of libinput_remove_source actually
wants their FD closed, so move the close() call there.

Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Jasper St. Pierre 2014-03-01 14:19:03 -05:00 committed by Peter Hutterer
parent 6ae636fe18
commit 385bfdb762
2 changed files with 1 additions and 1 deletions

View file

@ -714,6 +714,7 @@ touchpad_destroy(struct evdev_dispatch *dispatch)
struct libinput *libinput = touchpad->device->base.seat->libinput;
touchpad->filter->interface->destroy(touchpad->filter);
close(touchpad->fsm.timer.fd);
libinput_remove_source(libinput, touchpad->fsm.timer.source);
free(touchpad->fsm.events);
free(dispatch);

View file

@ -442,7 +442,6 @@ libinput_remove_source(struct libinput *libinput,
struct libinput_source *source)
{
epoll_ctl(libinput->epoll_fd, EPOLL_CTL_DEL, source->fd, NULL);
close(source->fd);
source->fd = -1;
list_insert(&libinput->source_destroy_list, &source->link);
}