forked from pool/util-linux
975eb859b7
libmount-fix-chdir-to-parent-for-restricted-user-umo.patch: fix umounting network filesystems as plain user (bnc#728480) OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=108
100 lines
2.7 KiB
Diff
100 lines
2.7 KiB
Diff
From 6107377322d5d6866c3aa363def656fdf68311e6 Mon Sep 17 00:00:00 2001
|
|
From: Karel Zak <kzak@redhat.com>
|
|
Date: Tue, 8 Nov 2011 21:47:23 +0100
|
|
Subject: [PATCH] libmount: fix chdir to parent for restricted (user) umounts
|
|
|
|
Reported-by: Petr Uzel <petr.uzel@suse.cz>
|
|
Signed-off-by: Karel Zak <kzak@redhat.com>
|
|
Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
|
|
---
|
|
libmount/src/utils.c | 41 +++++++++++++++++++++++++----------------
|
|
1 files changed, 25 insertions(+), 16 deletions(-)
|
|
|
|
Index: util-linux-2.20.1/libmount/src/utils.c
|
|
===================================================================
|
|
--- util-linux-2.20.1.orig/libmount/src/utils.c
|
|
+++ util-linux-2.20.1/libmount/src/utils.c
|
|
@@ -62,34 +62,40 @@ static char *stripoff_last_component(cha
|
|
if (!p)
|
|
return NULL;
|
|
*p = '\0';
|
|
- return ++p;
|
|
+ return p + 1;
|
|
}
|
|
|
|
-/* Note that the @target has to be absolute path (so at least "/")
|
|
+/*
|
|
+ * Note that the @target has to be absolute path (so at least "/"). The
|
|
+ * @filename returns allocated buffer with last path component, for example:
|
|
+ *
|
|
+ * mnt_chdir_to_parent("/mnt/test", &buf) ==> chdir("/mnt"), buf="test"
|
|
*/
|
|
int mnt_chdir_to_parent(const char *target, char **filename)
|
|
{
|
|
- char *path, *last = NULL;
|
|
+ char *buf, *parent, *last = NULL;
|
|
char cwd[PATH_MAX];
|
|
int rc = -EINVAL;
|
|
|
|
if (!target || *target != '/')
|
|
return -EINVAL;
|
|
|
|
- path = strdup(target);
|
|
- if (!path)
|
|
+ DBG(UTILS, mnt_debug("moving to %s parent", target));
|
|
+
|
|
+ buf = strdup(target);
|
|
+ if (!buf)
|
|
return -ENOMEM;
|
|
|
|
- if (*(path + 1) != '\0') {
|
|
- last = stripoff_last_component(path);
|
|
+ if (*(buf + 1) != '\0') {
|
|
+ last = stripoff_last_component(buf);
|
|
if (!last)
|
|
goto err;
|
|
}
|
|
- if (!*path)
|
|
- *path = '/'; /* root */
|
|
|
|
- if (chdir(path) == -1) {
|
|
- DBG(UTILS, mnt_debug("failed to chdir to %s: %m", path));
|
|
+ parent = buf && *buf ? buf : "/";
|
|
+
|
|
+ if (chdir(parent) == -1) {
|
|
+ DBG(UTILS, mnt_debug("failed to chdir to %s: %m", parent));
|
|
rc = -errno;
|
|
goto err;
|
|
}
|
|
@@ -98,14 +104,17 @@ int mnt_chdir_to_parent(const char *targ
|
|
rc = -errno;
|
|
goto err;
|
|
}
|
|
- if (strcmp(cwd, path) != 0) {
|
|
- DBG(UTILS, mnt_debug("path moved (%s -> %s)", path, cwd));
|
|
+ if (strcmp(cwd, parent) != 0) {
|
|
+ DBG(UTILS, mnt_debug(
|
|
+ "unexpected chdir (expected=%s, cwd=%s)", parent, cwd));
|
|
goto err;
|
|
}
|
|
|
|
- DBG(CXT, mnt_debug("current directory moved to %s", path));
|
|
+ DBG(CXT, mnt_debug(
|
|
+ "current directory moved to %s [last_component='%s']",
|
|
+ parent, last));
|
|
|
|
- *filename = path;
|
|
+ *filename = buf;
|
|
|
|
if (!last || !*last)
|
|
memcpy(*filename, ".", 2);
|
|
@@ -113,7 +122,7 @@ int mnt_chdir_to_parent(const char *targ
|
|
memcpy(*filename, last, strlen(last) + 1);
|
|
return 0;
|
|
err:
|
|
- free(path);
|
|
+ free(buf);
|
|
return rc;
|
|
}
|
|
|