7cce68e1e0
When in a userns environment we cannot take away per-mount point flags set on a mount point that was passed to us. Hence we need to be careful to always check the actual mount flags in place and manipulate only those flags of them that we actually want to change and not reset more as side-effect. We mostly got this right already in bind_remount_recursive_with_mountinfo(), but didn't in the simpler bind_remount_one_with_mountinfo(). Catch up. (The old code assumed that the MountEntry.flags field contained the right flag settings, but it actually doesn't for new mounts we just established as for those mount() establishes the initial flags for us, and we have to read them back to figure out which ones the kernel picked.) Fixes: #13622
36 lines
1.3 KiB
C
36 lines
1.3 KiB
C
/* SPDX-License-Identifier: LGPL-2.1+ */
|
|
#pragma once
|
|
|
|
#include <mntent.h>
|
|
#include <stdio.h>
|
|
|
|
#include "macro.h"
|
|
|
|
int repeat_unmount(const char *path, int flags);
|
|
int umount_recursive(const char *target, int flags);
|
|
int bind_remount_recursive(const char *prefix, unsigned long new_flags, unsigned long flags_mask, char **blacklist);
|
|
int bind_remount_recursive_with_mountinfo(const char *prefix, unsigned long new_flags, unsigned long flags_mask, char **blacklist, FILE *proc_self_mountinfo);
|
|
int bind_remount_one_with_mountinfo(const char *path, unsigned long new_flags, unsigned long flags_mask, FILE *proc_self_mountinfo);
|
|
|
|
int mount_move_root(const char *path);
|
|
|
|
DEFINE_TRIVIAL_CLEANUP_FUNC(FILE*, endmntent);
|
|
#define _cleanup_endmntent_ _cleanup_(endmntentp)
|
|
|
|
int mount_verbose(
|
|
int error_log_level,
|
|
const char *what,
|
|
const char *where,
|
|
const char *type,
|
|
unsigned long flags,
|
|
const char *options);
|
|
int umount_verbose(const char *where);
|
|
|
|
int mount_option_mangle(
|
|
const char *options,
|
|
unsigned long mount_flags,
|
|
unsigned long *ret_mount_flags,
|
|
char **ret_remaining_options);
|
|
|
|
int mode_to_inaccessible_node(const char *runtime_dir, mode_t mode, char **dest);
|