From df61216c678c6d00a85230521d3e9bd7354788cb Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Thu, 15 Nov 2018 12:11:29 +0100 Subject: libmount: (fuse) follow only user_id= on umount The option user= is already handled by evaluate_permissions() and by classic mount and umount usermount support. It seems we do not need to duplicate support for user= in is_fuse_usermount(). The option user_id= is fuse specific and it's maintained by libfuse/kernel in /proc/self/mountinfo. This is feature we need to support in umount(8). Addresses: https://github.com/karelzak/util-linux/pull/705 Signed-off-by: Karel Zak --- libmount/src/context_umount.c | 35 ++++++++--------------------------- 1 file changed, 8 insertions(+), 27 deletions(-) (limited to 'libmount') diff --git a/libmount/src/context_umount.c b/libmount/src/context_umount.c index 03c55ff61..7c5893ae6 100644 --- a/libmount/src/context_umount.c +++ b/libmount/src/context_umount.c @@ -393,10 +393,10 @@ static int is_fuse_usermount(struct libmnt_context *cxt, int *errsv) struct libmnt_ns *ns_old; const char *type = mnt_fs_get_fstype(cxt->fs); const char *optstr; - char *user = NULL, *user_id = NULL, *curr_user = NULL; + char *user_id = NULL; size_t sz; uid_t uid; - int ok = 0; + char uidstr[sizeof(stringify_value(ULONG_MAX))]; *errsv = 0; @@ -409,16 +409,15 @@ static int is_fuse_usermount(struct libmnt_context *cxt, int *errsv) strncmp(type, "fuseblk.", 8) != 0) return 0; - /* get user= or user_id= from mtab/mountinfo */ - optstr = mnt_fs_get_user_options(cxt->fs); + /* get user_id= from mount table */ + optstr = mnt_fs_get_fs_options(cxt->fs); if (!optstr) return 0; - if (mnt_optstr_get_option(optstr, "user", &user, &sz) != 0 && - mnt_optstr_get_option(optstr, "user_id", &user_id, &sz) != 0) + if (mnt_optstr_get_option(optstr, "user_id", &user_id, &sz) != 0) return 0; - if (sz == 0 || (user == NULL && user_id == NULL)) + if (sz == 0 || user_id == NULL) return 0; /* get current user */ @@ -429,32 +428,14 @@ static int is_fuse_usermount(struct libmnt_context *cxt, int *errsv) } uid = getuid(); - if (user) - curr_user = mnt_get_username(uid); if (!mnt_context_switch_ns(cxt, ns_old)) { *errsv = -MNT_ERR_NAMESPACE; return 0; } - if (user && !curr_user) { - DBG(CXT, ul_debugobj(cxt, "umount (fuse): cannot " - "convert %d to username", uid)); - return 0; - } - - if (user) - ok = strncmp(curr_user, user, sz) == 0; - - else if (user_id) { - char uidstr[sizeof(stringify_value(ULONG_MAX))]; - snprintf(uidstr, sizeof(uidstr), "%lu", (unsigned long) uid); - - ok = strncmp(user_id, uidstr, sz) == 0; - } - - free(curr_user); - return ok; + snprintf(uidstr, sizeof(uidstr), "%lu", (unsigned long) uid); + return strncmp(user_id, uidstr, sz) == 0; } /* -- cgit v1.2.3-55-g7522