mherrb/seatd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

logind: close_device always returned error

Browse source 
Error handling was broken in close_device, always returning -1.

Use the return value, and add a few errno assignments while we're at it.
This commit is contained in:
Kenny Levinsen 2020-08-06 02:23:12 +02:00
parent 304489c30d
commit 0fd525e85e
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libseat/backend/logind.c
View file

@ -115,6 +115,7 @@ out:
static int close_device(struct libseat *base, int device_id) { static int close_device(struct libseat *base, int device_id) {
struct backend_logind *session = backend_logind_from_libseat_backend(base); struct backend_logind *session = backend_logind_from_libseat_backend(base);
if (device_id < 0) { if (device_id < 0) {
errno = EINVAL;
return -1; return -1;
} }
@ -133,19 +134,20 @@ static int close_device(struct libseat *base, int device_id) {
sd_bus_message *msg = NULL; sd_bus_message *msg = NULL;
sd_bus_error error = SD_BUS_ERROR_NULL; sd_bus_error error = SD_BUS_ERROR_NULL;
sd_bus_call_method(session->bus, "org.freedesktop.login1", session->path, int ret = sd_bus_call_method(session->bus, "org.freedesktop.login1", session->path,
"org.freedesktop.login1.Session", "ReleaseDevice", &error, &msg, "uu", "org.freedesktop.login1.Session", "ReleaseDevice", &error,
major(st.st_rdev), minor(st.st_rdev)); &msg, "uu", major(st.st_rdev), minor(st.st_rdev));
sd_bus_error_free(&error); sd_bus_error_free(&error);
sd_bus_message_unref(msg); sd_bus_message_unref(msg);
return -1; return ret >= 0;
} }
static int switch_session(struct libseat *base, int s) { static int switch_session(struct libseat *base, int s) {
struct backend_logind *session = backend_logind_from_libseat_backend(base); struct backend_logind *session = backend_logind_from_libseat_backend(base);
if (s >= UINT16_MAX || s < 0) { if (s >= UINT16_MAX || s < 0) {
errno = EINVAL;
return -1; return -1;
} }
@ -192,6 +194,7 @@ static int poll_connection(struct backend_logind *backend, int timeout) {
} }
if (fd.revents & (POLLERR | POLLHUP)) { if (fd.revents & (POLLERR | POLLHUP)) {
errno = ECONNRESET;
return -1; return -1;
} }
return 0; return 0;