shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-04 17:47:03 +03:00
Code

Merge pull request #8285 from poettering/logind-close-fixes

Browse Source 
various smaller logind fixes
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-02-27 08:55:40 +01:00 committed by GitHub
commit ed762da2e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 77 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/journal-remote/journal-upload.c
View File

@ -328,9 +328,7 @@ static size_t fd_input_callback(void *buf, size_t size, size_t nmemb, void *user
static void close_fd_input(Uploader *u) {
assert(u);
if (u->input >= 0)
close_nointr(u->input);
u->input = -1;
u->input = safe_close(u->input);
u->timeout = 0;
}

2
src/libsystemd-network/sd-dhcp-server.c
View File

@ -316,7 +316,7 @@ static int dhcp_server_send_udp(sd_dhcp_server *server, be32_t destination,
int r;
assert(server);
assert(server->fd > 0);
assert(server->fd >= 0);
assert(message);
assert(len > sizeof(DHCPMessage));

25
src/libsystemd/sd-login/sd-login.c
View File

@ -990,8 +990,9 @@ static inline sd_login_monitor* FD_TO_MONITOR(int fd) {
}
_public_ int sd_login_monitor_new(const char *category, sd_login_monitor **m) {
int fd, k;
_cleanup_close_ int fd = -1;
bool good = false;
int k;
assert_return(m, -EINVAL);
@ -1001,50 +1002,42 @@ _public_ int sd_login_monitor_new(const char *category, sd_login_monitor **m) {
if (!category || streq(category, "seat")) {
k = inotify_add_watch(fd, "/run/systemd/seats/", IN_MOVED_TO|IN_DELETE);
if (k < 0) {
safe_close(fd);
if (k < 0)
return -errno;
}
good = true;
}
if (!category || streq(category, "session")) {
k = inotify_add_watch(fd, "/run/systemd/sessions/", IN_MOVED_TO|IN_DELETE);
if (k < 0) {
safe_close(fd);
if (k < 0)
return -errno;
}
good = true;
}
if (!category || streq(category, "uid")) {
k = inotify_add_watch(fd, "/run/systemd/users/", IN_MOVED_TO|IN_DELETE);
if (k < 0) {
safe_close(fd);
if (k < 0)
return -errno;
}
good = true;
}
if (!category || streq(category, "machine")) {
k = inotify_add_watch(fd, "/run/systemd/machines/", IN_MOVED_TO|IN_DELETE);
if (k < 0) {
safe_close(fd);
if (k < 0)
return -errno;
}
good = true;
}
if (!good) {
close_nointr(fd);
if (!good)
return -EINVAL;
}
*m = FD_TO_MONITOR(fd);
fd = -1;
return 0;
}

3
src/login/logind-core.c
View File

@ -618,6 +618,8 @@ bool manager_is_on_external_power(void) {
}
bool manager_all_buttons_ignored(Manager *m) {
assert(m);
if (m->handle_power_key != HANDLE_IGNORE)
return false;
if (m->handle_suspend_key != HANDLE_IGNORE)
@ -631,5 +633,6 @@ bool manager_all_buttons_ignored(Manager *m) {
return false;
if (m->handle_lid_switch_docked != HANDLE_IGNORE)
return false;
return true;
}

106
src/login/logind-session-device.c
View File

@ -74,20 +74,25 @@ static int session_device_notify(SessionDevice *sd, enum SessionDeviceNotificati
return r;
switch (type) {
case SESSION_DEVICE_RESUME:
r = sd_bus_message_append(m, "uuh", major, minor, sd->fd);
if (r < 0)
return r;
break;
case SESSION_DEVICE_TRY_PAUSE:
t = "pause";
break;
case SESSION_DEVICE_PAUSE:
t = "force";
break;
case SESSION_DEVICE_RELEASE:
t = "gone";
break;
default:
return -EINVAL;
}
@ -102,17 +107,15 @@ static int session_device_notify(SessionDevice *sd, enum SessionDeviceNotificati
}
static int sd_eviocrevoke(int fd) {
static bool warned;
int r;
static bool warned = false;
assert(fd >= 0);
r = ioctl(fd, EVIOCREVOKE, NULL);
if (r < 0) {
r = -errno;
if (r == -EINVAL && !warned) {
if (ioctl(fd, EVIOCREVOKE, NULL) < 0) {
if (errno == EINVAL && !warned) {
log_warning_errno(errno, "Kernel does not support evdev-revocation: %m");
warned = true;
log_warning("kernel does not support evdev-revocation");
}
}
@ -120,24 +123,18 @@ static int sd_eviocrevoke(int fd) {
}
static int sd_drmsetmaster(int fd) {
int r;
assert(fd >= 0);
r = ioctl(fd, DRM_IOCTL_SET_MASTER, 0);
if (r < 0)
if (ioctl(fd, DRM_IOCTL_SET_MASTER, 0) < 0)
return -errno;
return 0;
}
static int sd_drmdropmaster(int fd) {
int r;
assert(fd >= 0);
r = ioctl(fd, DRM_IOCTL_DROP_MASTER, 0);
if (r < 0)
if (ioctl(fd, DRM_IOCTL_DROP_MASTER, 0) < 0)
return -errno;
return 0;
@ -146,7 +143,9 @@ static int sd_drmdropmaster(int fd) {
static int session_device_open(SessionDevice *sd, bool active) {
int fd, r;
assert(sd);
assert(sd->type != DEVICE_TYPE_UNKNOWN);
assert(sd->node);
/* open device and try to get an udev_device from it */
fd = open(sd->node, O_RDWR|O_CLOEXEC|O_NOCTTY|O_NONBLOCK);
@ -154,28 +153,27 @@ static int session_device_open(SessionDevice *sd, bool active) {
return -errno;
switch (sd->type) {
case DEVICE_TYPE_DRM:
if (active) {
/* Weird legacy DRM semantics might return an error
* even though we're master. No way to detect that so
* fail at all times and let caller retry in inactive
* state. */
/* Weird legacy DRM semantics might return an error even though we're master. No way to detect
* that so fail at all times and let caller retry in inactive state. */
r = sd_drmsetmaster(fd);
if (r < 0) {
close_nointr(fd);
return r;
}
} else {
/* DRM-Master is granted to the first user who opens a
* device automatically (ughh, racy!). Hence, we just
* drop DRM-Master in case we were the first. */
} else
/* DRM-Master is granted to the first user who opens a device automatically (ughh,
* racy!). Hence, we just drop DRM-Master in case we were the first. */
sd_drmdropmaster(fd);
}
break;
case DEVICE_TYPE_EVDEV:
if (!active)
sd_eviocrevoke(fd);
break;
case DEVICE_TYPE_UNKNOWN:
default:
/* fallback for devices wihout synchronizations */
@ -195,26 +193,27 @@ static int session_device_start(SessionDevice *sd) {
return 0;
switch (sd->type) {
case DEVICE_TYPE_DRM:
/* Device is kept open. Simply call drmSetMaster() and hope
* there is no-one else. In case it fails, we keep the device
* paused. Maybe at some point we have a drmStealMaster(). */
/* Device is kept open. Simply call drmSetMaster() and hope there is no-one else. In case it fails, we
* keep the device paused. Maybe at some point we have a drmStealMaster(). */
r = sd_drmsetmaster(sd->fd);
if (r < 0)
return r;
break;
case DEVICE_TYPE_EVDEV:
/* Evdev devices are revoked while inactive. Reopen it and we
* are fine. */
/* Evdev devices are revoked while inactive. Reopen it and we are fine. */
r = session_device_open(sd, true);
if (r < 0)
return r;
/* For evdev devices, the file descriptor might be left
* uninitialized. This might happen while resuming into a
* session and logind has been restarted right before. */
/* For evdev devices, the file descriptor might be left uninitialized. This might happen while resuming
* into a session and logind has been restarted right before. */
safe_close(sd->fd);
sd->fd = r;
break;
case DEVICE_TYPE_UNKNOWN:
default:
/* fallback for devices wihout synchronizations */
@ -371,10 +370,8 @@ int session_device_new(Session *s, dev_t dev, bool open_device, SessionDevice **
goto error;
r = hashmap_put(s->devices, &sd->dev, sd);
if (r < 0) {
r = -ENOMEM;
if (r < 0)
goto error;
}
if (open_device) {
/* Open the device for the first time. We need a valid fd to pass back
@ -423,7 +420,7 @@ void session_device_free(SessionDevice *sd) {
session_device_stop(sd);
session_device_notify(sd, SESSION_DEVICE_RELEASE);
close_nointr(sd->fd);
safe_close(sd->fd);
LIST_REMOVE(sd_by_device, sd->device->session_devices, sd);
@ -458,13 +455,14 @@ void session_device_resume_all(Session *s) {
assert(s);
HASHMAP_FOREACH(sd, s->devices, i) {
if (!sd->active) {
if (session_device_start(sd) < 0)
continue;
if (session_device_save(sd) < 0)
continue;
session_device_notify(sd, SESSION_DEVICE_RESUME);
}
if (sd->active)
continue;
if (session_device_start(sd) < 0)
continue;
if (session_device_save(sd) < 0)
continue;
session_device_notify(sd, SESSION_DEVICE_RESUME);
}
}
@ -475,25 +473,27 @@ void session_device_pause_all(Session *s) {
assert(s);
HASHMAP_FOREACH(sd, s->devices, i) {
if (sd->active) {
session_device_stop(sd);
session_device_notify(sd, SESSION_DEVICE_PAUSE);
}
if (!sd->active)
continue;
session_device_stop(sd);
session_device_notify(sd, SESSION_DEVICE_PAUSE);
}
}
unsigned int session_device_try_pause_all(Session *s) {
unsigned num_pending = 0;
SessionDevice *sd;
Iterator i;
unsigned int num_pending = 0;
assert(s);
HASHMAP_FOREACH(sd, s->devices, i) {
if (sd->active) {
session_device_notify(sd, SESSION_DEVICE_TRY_PAUSE);
++num_pending;
}
if (!sd->active)
continue;
session_device_notify(sd, SESSION_DEVICE_TRY_PAUSE);
num_pending++;
}
return num_pending;
@ -527,7 +527,7 @@ int session_device_save(SessionDevice *sd) {
}
void session_device_attach_fd(SessionDevice *sd, int fd, bool active) {
assert(fd > 0);
assert(fd >= 0);
assert(sd);
assert(sd->fd < 0);
assert(!sd->active);

6
src/login/logind-session-device.h
View File

@ -39,9 +39,9 @@ struct SessionDevice {
dev_t dev;
char *node;
int fd;
bool active;
DeviceType type;
bool pushed_fd;
DeviceType type:3;
bool active:1;
bool pushed_fd:1;
LIST_FIELDS(struct SessionDevice, sd_by_device);
};

8
src/login/logind.c
View File

@ -453,9 +453,15 @@ static int manager_attach_fds(Manager *m) {
continue;
}
if (!S_ISCHR(st.st_mode) && !S_ISBLK(st.st_mode)) {
log_debug("Device fd doesn't actually point to device node: %m");
close_nointr(fd);
continue;
}
sd = hashmap_get(s->devices, &st.st_rdev);
if (!sd) {
/* Weird we got an fd for a session device which wasn't
/* Weird, we got an fd for a session device which wasn't
* recorded in the session state file... */
log_warning("Got fd for missing session device [%u:%u] in session %s",
major(st.st_rdev), minor(st.st_rdev), s->id);