diff options
| author | Alban Crequy <alban@kinvolk.io> | 2016-07-25 15:39:46 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2016-07-25 15:39:46 +0200 |
| commit | 98df8089bea1b2407c46495b6c2eb76dda46c658 (patch) | |
| tree | 65e8e718f013127c0859ad6515e40ca529e1b679 /src/basic | |
| parent | 3324079741297004a285decc77ac89b776fac1ee (diff) | |
namespace: don't fail on masked mounts (#3794)
Before this patch, a service file with ReadWriteDirectories=/file...
could fail if the file exists but is not a mountpoint, despite being
listed in /proc/self/mountinfo. It could happen with masked mounts.
Fixes https://github.com/systemd/systemd/issues/3793
Diffstat (limited to 'src/basic')
| -rw-r--r-- | src/basic/mount-util.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/basic/mount-util.c b/src/basic/mount-util.c index b91f0f9e0e..28dc778969 100644 --- a/src/basic/mount-util.c +++ b/src/basic/mount-util.c @@ -448,21 +448,21 @@ int bind_remount_recursive(const char *prefix, bool ro) { if (r < 0) return r; - /* Try to reuse the original flag set, but - * don't care for errors, in case of - * obstructed mounts */ + /* Deal with mount points that are obstructed by a + * later mount */ + r = path_is_mount_point(x, 0); + if (r == -ENOENT || r == 0) + continue; + if (r < 0) + return r; + + /* Try to reuse the original flag set */ orig_flags = 0; (void) get_mount_flags(x, &orig_flags); orig_flags &= ~MS_RDONLY; - if (mount(NULL, x, NULL, orig_flags|MS_BIND|MS_REMOUNT|(ro ? MS_RDONLY : 0), NULL) < 0) { - - /* Deal with mount points that are - * obstructed by a later mount */ - - if (errno != ENOENT) - return -errno; - } + if (mount(NULL, x, NULL, orig_flags|MS_BIND|MS_REMOUNT|(ro ? MS_RDONLY : 0), NULL) < 0) + return -errno; } } |