6b7c9f8bce
Previously, if ReadWritePaths= was nested inside a ReadOnlyPaths=
specification, then we'd first recursively apply the ReadOnlyPaths= paths, and
make everything below read-only, only in order to then flip the read-only bit
again for the subdirs listed in ReadWritePaths= below it.
This is not only ugly (as for the dirs in question we first turn on the RO bit,
only to turn it off again immediately after), but also problematic in
containers, where a container manager might have marked a set of dirs read-only
and this code will undo this is ReadWritePaths= is set for any.
With this patch behaviour in this regard is altered: ReadOnlyPaths= will not be
applied to the children listed in ReadWritePaths= in the first place, so that
we do not need to turn off the RO bit for those after all.
This means that ReadWritePaths=/ReadOnlyPaths= may only be used to turn on the
RO bit, but never to turn it off again. Or to say this differently: if some
dirs are marked read-only via some external tool, then ReadWritePaths= will not
undo it.
This is not only the safer option, but also more in-line with what the man page
currently claims:
"Entries (files or directories) listed in ReadWritePaths= are
accessible from within the namespace with the same access rights as
from outside."
To implement this change bind_remount_recursive() gained a new "blacklist"
string list parameter, which when passed may contain subdirs that shall be
excluded from the read-only mounting.
A number of functions are updated to add more debug logging to make this more
digestable.
55 lines
1.6 KiB
C
55 lines
1.6 KiB
C
#pragma once
|
|
|
|
/***
|
|
This file is part of systemd.
|
|
|
|
Copyright 2010 Lennart Poettering
|
|
|
|
systemd is free software; you can redistribute it and/or modify it
|
|
under the terms of the GNU Lesser General Public License as published by
|
|
the Free Software Foundation; either version 2.1 of the License, or
|
|
(at your option) any later version.
|
|
|
|
systemd is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public License
|
|
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
|
***/
|
|
|
|
#include <fcntl.h>
|
|
#include <mntent.h>
|
|
#include <stdbool.h>
|
|
#include <stdio.h>
|
|
#include <sys/stat.h>
|
|
#include <sys/types.h>
|
|
|
|
#include "macro.h"
|
|
#include "missing.h"
|
|
|
|
int fd_is_mount_point(int fd, const char *filename, int flags);
|
|
int path_is_mount_point(const char *path, int flags);
|
|
|
|
int repeat_unmount(const char *path, int flags);
|
|
|
|
int umount_recursive(const char *target, int flags);
|
|
int bind_remount_recursive(const char *prefix, bool ro, char **blacklist);
|
|
|
|
int mount_move_root(const char *path);
|
|
|
|
DEFINE_TRIVIAL_CLEANUP_FUNC(FILE*, endmntent);
|
|
#define _cleanup_endmntent_ _cleanup_(endmntentp)
|
|
|
|
bool fstype_is_network(const char *fstype);
|
|
|
|
union file_handle_union {
|
|
struct file_handle handle;
|
|
char padding[sizeof(struct file_handle) + MAX_HANDLE_SZ];
|
|
};
|
|
|
|
const char* mode_to_inaccessible_node(mode_t mode);
|
|
|
|
#define FILE_HANDLE_INIT { .handle.handle_bytes = MAX_HANDLE_SZ }
|