4f3af906fb
This version brings bug fixes, enhancements and a new script utility,
scriptlive. For detailed information see the release notes:
http://www.kernel.org/pub/linux/utils/util-linux/v2.35/v2.35-ReleaseNotes
Pull some fixed applied after the release.
Disable the use of code under GPLv3 included in hwclock since v2.30. The
subject was discussed upstream[1] and it was decided that hwclock will
be made GPLv2-only again in v2.36, so do it in advance in Buildroot.
Meanwhile, be warned that all OS images selecting hwclock built with
Buildroot since commit 74235a6854 (util-linux: bump to version 2.30)
contain code under GPLv3, which imposes some technical difficulties to
include in embedded systems. For more information see GPLv3, Section 6,
"Conveying Non-Source Forms", and the definitions of User Product and
Installation Information[2].
1. https://lore.kernel.org/util-linux/20200127202152.4jh2w4chch37wgee@ws.net.home/T/#t
2. https://www.gnu.org/licenses/gpl-3.0.html
Signed-off-by: Carlos Santos <unixmania@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
138 lines
4.1 KiB
Diff
138 lines
4.1 KiB
Diff
From 88f04bf9e637b14ff5274e4c4981e43ab2c40c2b Mon Sep 17 00:00:00 2001
|
|
From: Karel Zak <kzak@redhat.com>
|
|
Date: Tue, 28 Jan 2020 10:45:07 +0100
|
|
Subject: [PATCH] libmount: fix x- options use for non-root users
|
|
|
|
libmount returns EPERM for all X- and x- mount options for non-root
|
|
users when evaluate X-mount.mkdir. It's bug, we need to be sensitive
|
|
to only X-mount.mkdir and only if the target directory is missing.
|
|
|
|
Addresses: https://github.com/karelzak/util-linux/issues/941
|
|
Signed-off-by: Karel Zak <kzak@redhat.com>
|
|
---
|
|
libmount/src/context.c | 41 ++++++++++++++++++++++-------------------
|
|
sys-utils/mount.8 | 6 +++---
|
|
2 files changed, 25 insertions(+), 22 deletions(-)
|
|
|
|
diff --git a/libmount/src/context.c b/libmount/src/context.c
|
|
index 6c536cc15..91fe8e4bf 100644
|
|
--- a/libmount/src/context.c
|
|
+++ b/libmount/src/context.c
|
|
@@ -1855,49 +1855,48 @@ end:
|
|
return rc;
|
|
}
|
|
|
|
-/* create a mountpoint if X-mount.mkdir[=<mode>] specified */
|
|
-static int mkdir_target(const char *tgt, struct libmnt_fs *fs)
|
|
+static int is_mkdir_required(const char *tgt, struct libmnt_fs *fs, mode_t *mode, int *rc)
|
|
{
|
|
char *mstr = NULL;
|
|
size_t mstr_sz = 0;
|
|
- mode_t mode = 0;
|
|
struct stat st;
|
|
- int rc;
|
|
|
|
assert(tgt);
|
|
assert(fs);
|
|
+ assert(mode);
|
|
+ assert(rc);
|
|
+
|
|
+ *mode = 0;
|
|
+ *rc = 0;
|
|
|
|
if (mnt_optstr_get_option(fs->user_optstr, "X-mount.mkdir", &mstr, &mstr_sz) != 0 &&
|
|
mnt_optstr_get_option(fs->user_optstr, "x-mount.mkdir", &mstr, &mstr_sz) != 0) /* obsolete */
|
|
return 0;
|
|
|
|
- DBG(CXT, ul_debug("mkdir %s (%s) wanted", tgt, mstr));
|
|
-
|
|
if (mnt_stat_mountpoint(tgt, &st) == 0)
|
|
return 0;
|
|
|
|
+ DBG(CXT, ul_debug("mkdir %s (%s) wanted", tgt, mstr));
|
|
+
|
|
if (mstr && mstr_sz) {
|
|
char *end = NULL;
|
|
|
|
errno = 0;
|
|
- mode = strtol(mstr, &end, 8);
|
|
+ *mode = strtol(mstr, &end, 8);
|
|
|
|
if (errno || !end || mstr + mstr_sz != end) {
|
|
DBG(CXT, ul_debug("failed to parse mkdir mode '%s'", mstr));
|
|
- return -MNT_ERR_MOUNTOPT;
|
|
+ *rc = -MNT_ERR_MOUNTOPT;
|
|
+ return 0;
|
|
}
|
|
}
|
|
|
|
- if (!mode)
|
|
- mode = S_IRWXU | /* 0755 */
|
|
+ if (!*mode)
|
|
+ *mode = S_IRWXU | /* 0755 */
|
|
S_IRGRP | S_IXGRP |
|
|
S_IROTH | S_IXOTH;
|
|
|
|
- rc = mkdir_p(tgt, mode);
|
|
- if (rc)
|
|
- DBG(CXT, ul_debug("mkdir %s failed: %m", tgt));
|
|
-
|
|
- return rc;
|
|
+ return 1;
|
|
}
|
|
|
|
int mnt_context_prepare_target(struct libmnt_context *cxt)
|
|
@@ -1905,6 +1904,7 @@ int mnt_context_prepare_target(struct libmnt_context *cxt)
|
|
const char *tgt, *prefix;
|
|
int rc = 0;
|
|
struct libmnt_ns *ns_old;
|
|
+ mode_t mode = 0;
|
|
|
|
assert(cxt);
|
|
assert(cxt->fs);
|
|
@@ -1946,12 +1946,15 @@ int mnt_context_prepare_target(struct libmnt_context *cxt)
|
|
/* X-mount.mkdir target */
|
|
if (cxt->action == MNT_ACT_MOUNT
|
|
&& (cxt->user_mountflags & MNT_MS_XCOMMENT ||
|
|
- cxt->user_mountflags & MNT_MS_XFSTABCOMM)) {
|
|
+ cxt->user_mountflags & MNT_MS_XFSTABCOMM)
|
|
+ && is_mkdir_required(tgt, cxt->fs, &mode, &rc)) {
|
|
|
|
/* supported only for root or non-suid mount(8) */
|
|
- if (!mnt_context_is_restricted(cxt))
|
|
- rc = mkdir_target(tgt, cxt->fs);
|
|
- else
|
|
+ if (!mnt_context_is_restricted(cxt)) {
|
|
+ rc = mkdir_p(tgt, mode);
|
|
+ if (rc)
|
|
+ DBG(CXT, ul_debug("mkdir %s failed: %m", tgt));
|
|
+ } else
|
|
rc = -EPERM;
|
|
}
|
|
|
|
diff --git a/sys-utils/mount.8 b/sys-utils/mount.8
|
|
index 3e57251ed..698b0f011 100644
|
|
--- a/sys-utils/mount.8
|
|
+++ b/sys-utils/mount.8
|
|
@@ -1306,14 +1306,14 @@ functionality have been extended to keep existing fstab configurations usable
|
|
without a change.
|
|
.TP
|
|
.BR X-mount.mkdir [ = \fImode\fR ]
|
|
-Allow to make a target directory (mountpoint). The optional argument
|
|
+Allow to make a target directory (mountpoint) if it does not exit yet.
|
|
+The optional argument
|
|
.I mode
|
|
specifies the filesystem access mode used for
|
|
.BR mkdir (2)
|
|
in octal notation. The default mode is 0755. This functionality is supported
|
|
only for root users or when mount executed without suid permissions. The option
|
|
-is also supported as x-mount.mkdir, this notation is deprecated for mount.mkdir
|
|
-since v2.30.
|
|
+is also supported as x-mount.mkdir, this notation is deprecated since v2.30.
|
|
|
|
.SH "FILESYSTEM-SPECIFIC MOUNT OPTIONS"
|
|
You should consult the respective man page for the filesystem first.
|
|
--
|
|
2.18.2
|
|
|