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

pid1,shutdown: do not cunescape paths from libmount

Browse source 
The test added in previous commit shows that libmount does the unescaping
internally.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2019-04-05 10:17:03 +02:00
parent b57adc94cd
commit 9d1b2b2252
2 changed files with 20 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/core/mount.c
View file

@ -11,7 +11,6 @@
#include "dbus-mount.h"
#include "dbus-unit.h"
#include "device.h"
#include "escape.h"
#include "exit-status.h"
#include "format-util.h"
#include "fstab-util.h"
@ -1616,7 +1615,6 @@ static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) {
for (;;) {
struct libmnt_fs *fs;
const char *device, *path, *options, *fstype;
_cleanup_free_ char *d = NULL, *p = NULL;
int k;
k = mnt_table_next_fs(t, i, &fs);
@ -1633,15 +1631,9 @@ static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) {
if (!device || !path)
continue;
if (cunescape(device, UNESCAPE_RELAX, &d) < 0)
return log_oom();
device_found_node(m, device, DEVICE_FOUND_MOUNT, DEVICE_FOUND_MOUNT);
if (cunescape(path, UNESCAPE_RELAX, &p) < 0)
return log_oom();
device_found_node(m, d, DEVICE_FOUND_MOUNT, DEVICE_FOUND_MOUNT);
(void) mount_setup_unit(m, d, p, options, fstype, set_flags);
(void) mount_setup_unit(m, device, path, options, fstype, set_flags);
}
return 0;

40
src/shutdown/umount.c
View file

@ -74,11 +74,10 @@ int mount_points_list_get(const char *mountinfo, MountPoint **head) {
struct libmnt_fs *fs;
const char *path, *fstype;
_cleanup_free_ char *options = NULL;
_cleanup_free_ char *p = NULL;
unsigned long remount_flags = 0u;
_cleanup_free_ char *remount_options = NULL;
bool try_remount_ro;
MountPoint *m;
_cleanup_free_ MountPoint *m = NULL;
r = mnt_table_next_fs(t, i, &fs);
if (r == 1)
@ -90,18 +89,15 @@ int mount_points_list_get(const char *mountinfo, MountPoint **head) {
if (!path)
continue;
if (cunescape(path, UNESCAPE_RELAX, &p) < 0)
return log_oom();
fstype = mnt_fs_get_fstype(fs);
/* Combine the generic VFS options with the FS-specific
* options. Duplicates are not a problem here, because the only
* options that should come up twice are typically ro/rw, which
* are turned into MS_RDONLY or the invertion of it.
* are turned into MS_RDONLY or the inversion of it.
*
* Even if there are duplicates later in mount_option_mangle()
* it shouldn't hurt anyways as they override each other.
* they shouldn't hurt anyways as they override each other.
*/
if (!strextend_with_separator(&options, ",",
mnt_fs_get_vfs_options(fs),
@ -119,9 +115,9 @@ int mount_points_list_get(const char *mountinfo, MountPoint **head) {
* and hence not worth spending time on. Also, in
* unprivileged containers we might lack the rights to
* unmount these things, hence don't bother. */
if (mount_point_is_api(p) ||
mount_point_ignore(p) ||
PATH_STARTSWITH_SET(p, "/dev", "/sys", "/proc"))
if (mount_point_is_api(path) ||
mount_point_ignore(path) ||
PATH_STARTSWITH_SET(path, "/dev", "/sys", "/proc"))
continue;
/* If we are in a container, don't attempt to
@ -167,12 +163,15 @@ int mount_points_list_get(const char *mountinfo, MountPoint **head) {
if (!m)
return log_oom();
free_and_replace(m->path, p);
free_and_replace(m->remount_options, remount_options);
m->path = strdup(path);
if (!m->path)
return log_oom();
m->remount_options = TAKE_PTR(remount_options);
m->remount_flags = remount_flags;
m->try_remount_ro = try_remount_ro;
LIST_PREPEND(mount_point, *head, m);
LIST_PREPEND(mount_point, *head, TAKE_PTR(m));
}
return 0;
@ -196,10 +195,8 @@ int swap_list_get(const char *swaps, MountPoint **head) {
for (;;) {
struct libmnt_fs *fs;
MountPoint *swap;
_cleanup_free_ MountPoint *swap = NULL;
const char *source;
_cleanup_free_ char *d = NULL;
r = mnt_table_next_fs(t, i, &fs);
if (r == 1)
@ -211,16 +208,15 @@ int swap_list_get(const char *swaps, MountPoint **head) {
if (!source)
continue;
r = cunescape(source, UNESCAPE_RELAX, &d);
if (r < 0)
return r;
swap = new0(MountPoint, 1);
if (!swap)
return -ENOMEM;
free_and_replace(swap->path, d);
LIST_PREPEND(mount_point, *head, swap);
swap->path = strdup(source);
if (!swap->path)
return -ENOMEM;
LIST_PREPEND(mount_point, *head, TAKE_PTR(swap));
}
return 0;