picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

mount: be more careful about errors when parsing mtab

Browse source 
Fixup for 4a3a9ef610.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2014-11-28 13:02:15 -05:00
parent 9d05dd2e1e
commit 5cca8defd2
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/core/mount.c
View file

@ -1535,15 +1535,22 @@ static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) {
if (!tb || !itr)
return log_oom();
mnt_table_parse_mtab(tb, NULL);
if (r)
r = mnt_table_parse_mtab(tb, NULL);
if (r < 0)
return r;
while (mnt_table_next_fs(tb, itr, &fs) == 0) {
r = 0;
for (;;) {
const char *device, *path, *options, *fstype;
_cleanup_free_ const char *d = NULL, *p = NULL;
int k;
k = mnt_table_next_fs(tb, itr, &fs);
if (k == 1)
break;
else if (k < 0)
return log_error_errno(k, "Failed to get next entry from /etc/fstab: %m");
device = mnt_fs_get_source(fs);
path = mnt_fs_get_target(fs);
options = mnt_fs_get_options(fs);
@ -1555,7 +1562,7 @@ static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) {
return log_oom();
k = mount_add_one(m, d, p, options, fstype, set_flags);
if (k < 0)
if (r == 0 && k < 0)
r = k;
}