From patchwork Wed Mar 18 15:09:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 11445601 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B0C9C92A for ; Wed, 18 Mar 2020 15:09:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7DF8620757 for ; Wed, 18 Mar 2020 15:09:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ZsijcYra" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727280AbgCRPJK (ORCPT ); Wed, 18 Mar 2020 11:09:10 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:42310 "EHLO us-smtp-delivery-74.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727114AbgCRPJK (ORCPT ); Wed, 18 Mar 2020 11:09:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584544149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=22lncxfcqZQcn2mal3JKyKdlMv6rjfIshC0XEA//c1o=; b=ZsijcYraSGB0cx7KczUp3UPmEbZjq2ot6IgY6Z7sktiYSmqfo0mMQKuKeuFiuEDvFk5RNX bSnepd4YZPQ7xkEVWRItsL2jWmnaC58DKvRBY+8tPyAaeKwOSw94MQsutiw9Vfecjf73l7 qcWVDTkXfDYQQDDQSu0f3YpIW2o4Vcs= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-332-K6ZYSg-GOZCE1mq2i1ErxA-1; Wed, 18 Mar 2020 11:09:07 -0400 X-MC-Unique: K6ZYSg-GOZCE1mq2i1ErxA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9107F8017CC; Wed, 18 Mar 2020 15:09:05 +0000 (UTC) Received: from warthog.procyon.org.uk (ovpn-113-126.rdu2.redhat.com [10.10.113.126]) by smtp.corp.redhat.com (Postfix) with ESMTP id E361C5D9E2; Wed, 18 Mar 2020 15:09:02 +0000 (UTC) Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 Subject: [PATCH 06/13] fsinfo: Allow mount information to be queried [ver #19] From: David Howells To: torvalds@linux-foundation.org, viro@zeniv.linux.org.uk Cc: dhowells@redhat.com, raven@themaw.net, mszeredi@redhat.com, christian@brauner.io, jannh@google.com, darrick.wong@oracle.com, kzak@redhat.com, jlayton@redhat.com, linux-api@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org Date: Wed, 18 Mar 2020 15:09:02 +0000 Message-ID: <158454414209.2864823.11927146846876689886.stgit@warthog.procyon.org.uk> In-Reply-To: <158454408854.2864823.5910520544515668590.stgit@warthog.procyon.org.uk> References: <158454408854.2864823.5910520544515668590.stgit@warthog.procyon.org.uk> User-Agent: StGit/0.21 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk List-ID: Allow mount information, including information about a mount object to be queried with the fsinfo() system call. Setting FSINFO_FLAGS_QUERY_MOUNT allows overlapping mounts to be queried by indicating that the syscall should interpret the pathname as a number indicating the mount ID. To this end, a number of fsinfo() attributes are provided: (1) FSINFO_ATTR_MOUNT_INFO. This is a structure providing information about a mount, including: - Mount ID (can be used with FSINFO_FLAGS_QUERY_MOUNT). - Mount uniquifier ID. - Mount attributes (eg. R/O, NOEXEC). - Mount change/notification counters. - Superblock ID. - Superblock change/notification counters. (2) FSINFO_ATTR_MOUNT_PATH. This a string providing information about a bind mount relative the the root that was bound off, though it may get overridden by the filesystem (NFS unconditionally sets it to "/", for example). (3) FSINFO_ATTR_MOUNT_POINT. This is a string indicating the name of the mountpoint within the parent mount, limited to the parent's mounted root and the chroot. (4) FSINFO_ATTR_MOUNT_POINT_FULL. This is a string indicating the full path of the mountpoint, limited to the chroot. Signed-off-by: David Howells --- fs/d_path.c | 2 - fs/fsinfo.c | 13 +++++ fs/internal.h | 9 +++ fs/namespace.c | 111 +++++++++++++++++++++++++++++++++++++++++++ include/uapi/linux/fsinfo.h | 17 +++++++ samples/vfs/test-fsinfo.c | 16 ++++++ 6 files changed, 167 insertions(+), 1 deletion(-) diff --git a/fs/d_path.c b/fs/d_path.c index 0f1fc1743302..4c203f64e45e 100644 --- a/fs/d_path.c +++ b/fs/d_path.c @@ -229,7 +229,7 @@ static int prepend_unreachable(char **buffer, int *buflen) return prepend(buffer, buflen, "(unreachable)", 13); } -static void get_fs_root_rcu(struct fs_struct *fs, struct path *root) +void get_fs_root_rcu(struct fs_struct *fs, struct path *root) { unsigned seq; diff --git a/fs/fsinfo.c b/fs/fsinfo.c index 3250b9ff2905..a08b172f71d2 100644 --- a/fs/fsinfo.c +++ b/fs/fsinfo.c @@ -236,6 +236,14 @@ static int fsinfo_generic_seq_read(struct path *path, struct fsinfo_context *ctx ret = sb->s_op->show_options(&m, path->mnt->mnt_root); break; + case FSINFO_ATTR_MOUNT_PATH: + if (sb->s_op->show_path) { + ret = sb->s_op->show_path(&m, path->mnt->mnt_root); + } else { + seq_dentry(&m, path->mnt->mnt_root, " \t\n\\"); + } + break; + case FSINFO_ATTR_FS_STATISTICS: if (sb->s_op->show_stats) ret = sb->s_op->show_stats(&m, path->mnt->mnt_root); @@ -270,6 +278,11 @@ static const struct fsinfo_attribute fsinfo_common_attributes[] = { FSINFO_LIST (FSINFO_ATTR_FSINFO_ATTRIBUTES, (void *)123UL), FSINFO_VSTRUCT_N(FSINFO_ATTR_FSINFO_ATTRIBUTE_INFO, (void *)123UL), + + FSINFO_VSTRUCT (FSINFO_ATTR_MOUNT_INFO, fsinfo_generic_mount_info), + FSINFO_STRING (FSINFO_ATTR_MOUNT_PATH, fsinfo_generic_seq_read), + FSINFO_STRING (FSINFO_ATTR_MOUNT_POINT, fsinfo_generic_mount_point), + FSINFO_STRING (FSINFO_ATTR_MOUNT_POINT_FULL, fsinfo_generic_mount_point_full), {} }; diff --git a/fs/internal.h b/fs/internal.h index abbd5299e7dc..68e300a1e9a3 100644 --- a/fs/internal.h +++ b/fs/internal.h @@ -15,6 +15,7 @@ struct mount; struct shrink_control; struct fs_context; struct user_namespace; +struct fsinfo_context; /* * block_dev.c @@ -47,6 +48,11 @@ extern int __block_write_begin_int(struct page *page, loff_t pos, unsigned len, */ extern void __init chrdev_init(void); +/* + * d_path.c + */ +extern void get_fs_root_rcu(struct fs_struct *fs, struct path *root); + /* * fs_context.c */ @@ -93,6 +99,9 @@ extern void __mnt_drop_write_file(struct file *); extern void dissolve_on_fput(struct vfsmount *); extern int lookup_mount_object(struct path *, int, struct path *); extern int fsinfo_generic_mount_source(struct path *, struct fsinfo_context *); +extern int fsinfo_generic_mount_info(struct path *, struct fsinfo_context *); +extern int fsinfo_generic_mount_point(struct path *, struct fsinfo_context *); +extern int fsinfo_generic_mount_point_full(struct path *, struct fsinfo_context *); /* * fs_struct.c diff --git a/fs/namespace.c b/fs/namespace.c index 54e8eb93fdd6..483fbbde5c28 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -4149,4 +4149,115 @@ int lookup_mount_object(struct path *root, int mnt_id, struct path *_mntpt) goto out_unlock; } +/* + * Retrieve information about the nominated mount. + */ +int fsinfo_generic_mount_info(struct path *path, struct fsinfo_context *ctx) +{ + struct fsinfo_mount_info *p = ctx->buffer; + struct super_block *sb; + struct mount *m; + unsigned int flags; + + m = real_mount(path->mnt); + sb = m->mnt.mnt_sb; + + p->sb_unique_id = sb->s_unique_id; + p->mnt_unique_id = m->mnt_unique_id; + p->mnt_id = m->mnt_id; + + flags = READ_ONCE(m->mnt.mnt_flags); + if (flags & MNT_READONLY) + p->attr |= MOUNT_ATTR_RDONLY; + if (flags & MNT_NOSUID) + p->attr |= MOUNT_ATTR_NOSUID; + if (flags & MNT_NODEV) + p->attr |= MOUNT_ATTR_NODEV; + if (flags & MNT_NOEXEC) + p->attr |= MOUNT_ATTR_NOEXEC; + if (flags & MNT_NODIRATIME) + p->attr |= MOUNT_ATTR_NODIRATIME; + + if (flags & MNT_NOATIME) + p->attr |= MOUNT_ATTR_NOATIME; + else if (flags & MNT_RELATIME) + p->attr |= MOUNT_ATTR_RELATIME; + else + p->attr |= MOUNT_ATTR_STRICTATIME; + return sizeof(*p); +} + +/* + * Return the path of this mount relative to its parent and clipped to + * the current chroot. + */ +int fsinfo_generic_mount_point(struct path *path, struct fsinfo_context *ctx) +{ + struct mountpoint *mp; + struct mount *m, *parent; + struct path mountpoint, root; + void *p; + + rcu_read_lock(); + + m = real_mount(path->mnt); + parent = m->mnt_parent; + if (parent == m) + goto skip; + mp = READ_ONCE(m->mnt_mp); + if (mp) + goto found; +skip: + rcu_read_unlock(); + return -ENODATA; + +found: + mountpoint.mnt = &parent->mnt; + mountpoint.dentry = READ_ONCE(mp->m_dentry); + + get_fs_root_rcu(current->fs, &root); + if (path->mnt == root.mnt) { + rcu_read_unlock(); + return fsinfo_string("/", ctx); + } + + if (root.mnt != &parent->mnt) { + root.mnt = &parent->mnt; + root.dentry = parent->mnt.mnt_root; + } + + p = __d_path(&mountpoint, &root, ctx->buffer, ctx->buf_size); + rcu_read_unlock(); + + if (IS_ERR(p)) + return PTR_ERR(p); + if (!p) + return -EPERM; + + ctx->skip = p - ctx->buffer; + return (ctx->buffer + ctx->buf_size) - p; +} + +/* + * Return the path of this mount from the current chroot. + */ +int fsinfo_generic_mount_point_full(struct path *path, struct fsinfo_context *ctx) +{ + struct path root; + void *p; + + rcu_read_lock(); + get_fs_root_rcu(current->fs, &root); + p = __d_path(path, &root, ctx->buffer, ctx->buf_size); + rcu_read_unlock(); + + if (IS_ERR(p)) + return PTR_ERR(p); + if (!p) + return -EPERM; + + ctx->skip = p - ctx->buffer; + return (ctx->buffer + ctx->buf_size) - p; +} + #endif /* CONFIG_FSINFO */ diff --git a/include/uapi/linux/fsinfo.h b/include/uapi/linux/fsinfo.h index 0ae050a5227b..df96301dc612 100644 --- a/include/uapi/linux/fsinfo.h +++ b/include/uapi/linux/fsinfo.h @@ -31,6 +31,11 @@ #define FSINFO_ATTR_FSINFO_ATTRIBUTE_INFO 0x100 /* Information about attr N (for path) */ #define FSINFO_ATTR_FSINFO_ATTRIBUTES 0x101 /* List of supported attrs (for path) */ +#define FSINFO_ATTR_MOUNT_INFO 0x200 /* Mount object information */ +#define FSINFO_ATTR_MOUNT_PATH 0x201 /* Bind mount/superblock path (string) */ +#define FSINFO_ATTR_MOUNT_POINT 0x202 /* Relative path of mount in parent (string) */ +#define FSINFO_ATTR_MOUNT_POINT_FULL 0x203 /* Absolute path of mount (string) */ + /* * Optional fsinfo() parameter structure. * @@ -85,6 +90,18 @@ struct fsinfo_u128 { #endif }; +/* + * Information struct for fsinfo(FSINFO_ATTR_MOUNT_INFO). + */ +struct fsinfo_mount_info { + __u64 sb_unique_id; /* Kernel-lifetime unique superblock ID */ + __u64 mnt_unique_id; /* Kernel-lifetime unique mount ID */ + __u32 mnt_id; /* Mount identifier (use with AT_FSINFO_MOUNTID_PATH) */ + __u32 attr; /* MOUNT_ATTR_* flags */ +}; + +#define FSINFO_ATTR_MOUNT_INFO__STRUCT struct fsinfo_mount_info + /* * Information struct for fsinfo(FSINFO_ATTR_STATFS). * - This gives extended filesystem information. diff --git a/samples/vfs/test-fsinfo.c b/samples/vfs/test-fsinfo.c index 90fd95c46f2e..b23d0d56988f 100644 --- a/samples/vfs/test-fsinfo.c +++ b/samples/vfs/test-fsinfo.c @@ -288,6 +288,17 @@ static void dump_fsinfo_generic_volume_uuid(void *reply, unsigned int size) f->uuid[14], f->uuid[15]); } +static void dump_fsinfo_generic_mount_info(void *reply, unsigned int size) +{ + struct fsinfo_mount_info *r = reply; + + printf("\n"); + printf("\tsb_uniq : %llx\n", (unsigned long long)r->sb_unique_id); + printf("\tmnt_uniq: %llx\n", (unsigned long long)r->mnt_unique_id); + printf("\tmnt_id : %x\n", r->mnt_id); + printf("\tattr : %x\n", r->attr); +} + static void dump_string(void *reply, unsigned int size) { char *s = reply, *p; @@ -364,6 +375,11 @@ static const struct fsinfo_attribute fsinfo_attributes[] = { FSINFO_VSTRUCT_N(FSINFO_ATTR_FSINFO_ATTRIBUTE_INFO, fsinfo_meta_attribute_info), FSINFO_LIST (FSINFO_ATTR_FSINFO_ATTRIBUTES, fsinfo_meta_attributes), + + FSINFO_VSTRUCT (FSINFO_ATTR_MOUNT_INFO, fsinfo_generic_mount_info), + FSINFO_STRING (FSINFO_ATTR_MOUNT_PATH, string), + FSINFO_STRING_N (FSINFO_ATTR_MOUNT_POINT, string), + FSINFO_STRING_N (FSINFO_ATTR_MOUNT_POINT_FULL, string), {} };