clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-09-04 04:31:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

core: do not segfault if /proc/swaps cannot be opened

Browse Source 
The refactoring in f84b1b1ff9 ('core: do not segfault if swap
activity happens when /proc/swaps is not open') caused
swap_dispatch_reload and swap_enumerate to continue even if fopen()
failed with ENOENT.

This should instead be modified to return from swap_dispatch_reload and
swap_enumerate, rather than continuing to load the list of swaps when
m->proc_swaps is NULL.

https://bugzilla.redhat.com/show_bug.cgi?id=1069393
This commit is contained in:
Matt Mullins
2014-02-24 21:18:56 -05:00
committed by Zbigniew Jędrzejewski-Szmek
parent 4ae930d9dd
commit 817a2d0c98
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/swap.c
+3 -3
View File
@@ -1074,7 +1074,7 @@ static int open_proc_swaps(Manager *m) {
m->proc_swaps = fopen("/proc/swaps", "re");
if (!m->proc_swaps)
return (errno == ENOENT) ? 0 : -errno;
return -errno;
m->swap_watch.type = WATCH_SWAP;
m->swap_watch.fd = fileno(m->proc_swaps);
@@ -1097,7 +1097,7 @@ int swap_dispatch_reload(Manager *m) {
r = open_proc_swaps(m);
if (r < 0)
return r;
return (r == -ENOENT) ? 0 : r;
return swap_fd_event(m, EPOLLPRI);
}
@@ -1250,7 +1250,7 @@ static int swap_enumerate(Manager *m) {
r = open_proc_swaps(m);
if (r < 0)
return r;
return (r == -ENOENT) ? 0 : r;
r = swap_load_proc_swaps(m, false);
if (r < 0)