Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp4656611pxv; Tue, 29 Jun 2021 12:14:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyK5zkeaN9Tr1BpkdZ9+NIZol5wwG7ic+Yupskfn1sMEMWQQNcVhjuTgC+E6emqQlehWm6I X-Received: by 2002:a05:6402:b81:: with SMTP id cf1mr43314234edb.102.1624994099109; Tue, 29 Jun 2021 12:14:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624994099; cv=none; d=google.com; s=arc-20160816; b=qaZeb9CjhGjlK0VDF3TBQB1NP31dh+rQDQ9OCGBGNiNA7tRFn4EC+4vUuOpHjNl2Z3 xF/wiVJV0TsUrpWQFiT18LPpIgu8k6XBFnE1PZ+PFyAy7qoMxnBWFhdvEBNjIwOOj+Ar 7hscEB54y3qQCKv6DA/uboMmEB5zhaYTLZxfp9GNb3RGGQK+rU1SdJgUCAUIc5JKQUmg F2wuH/I9XpRlb+RMPl5sxghB1e0OuGcp2glMMdWDggloRlZwGebKSTza86r51I8jAzWJ CB1qzGiHvLUQHZBlq0A7tojFOoUwo5Bz/Uuy69ALAQszIEJjiHfphCc+udXOTZTz+9ql Y2Zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=FffL0UUqeBl5ky8B3CvIXDU4Y82aFDSKPfC1G7I32JA=; b=aqXrreSh7t9P/AR10ETb5w1ruuIF3YdIZATsT87b/Occcp+D1qJ8l1vSoeAmGnZsfd jiwaxIuZWXhbOLzXQXKu8skkcoTCJn3ZSFSEYRAU9q0uVQzwQqSKQPOhAgV00GfOt+K4 u8Wpg+37kPRmJHOOHlvXkvwDnRCXtsu8vcDNUPjQoHK3XDm58t2M5zfUEVBKE4zI/oDj O8infYGz0SOSN818c+DvAwKFClKPhF+5LfrcIlIPMDItDvB/+6Dgy7SY2rLZD2wm9TB0 Ig/85hZqq/FPhPIh4Ib2Nf/GOq0QzQRr1nc3CbXSEOM6cuOt8DxJUUI++2qIOcrwk3Fo usMQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id 28si16896612ejb.236.2021.06.29.12.14.32; Tue, 29 Jun 2021 12:14:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235464AbhF2TOo (ORCPT + 99 others); Tue, 29 Jun 2021 15:14:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234228AbhF2TOn (ORCPT ); Tue, 29 Jun 2021 15:14:43 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6D414C061760; Tue, 29 Jun 2021 12:12:15 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: krisman) with ESMTPSA id EDDD81F431AF From: Gabriel Krisman Bertazi To: amir73il@gmail.com Cc: djwong@kernel.org, tytso@mit.edu, david@fromorbit.com, jack@suse.com, dhowells@redhat.com, khazhy@google.com, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, Gabriel Krisman Bertazi , kernel@collabora.com Subject: [PATCH v3 03/15] fanotify: Split fsid check from other fid mode checks Date: Tue, 29 Jun 2021 15:10:23 -0400 Message-Id: <20210629191035.681913-4-krisman@collabora.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210629191035.681913-1-krisman@collabora.com> References: <20210629191035.681913-1-krisman@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org FAN_FS_ERROR will require fsid, but not necessarily require the filesystem to expose a file handle. Split those checks into different functions, so they can be used separately when setting up an event. While there, update a comment about tmpfs having 0 fsid, which is no longer true. Signed-off-by: Gabriel Krisman Bertazi --- Changes since v2: - FAN_ERROR -> FAN_FS_ERROR (Amir) - Update comment (Amir) Changes since v1: (Amir) - Sort hunks to simplify diff. Changes since RFC: (Amir) - Rename fanotify_check_path_fsid -> fanotify_test_fsid. - Use dentry directly instead of path. --- fs/notify/fanotify/fanotify_user.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c index 68a53d3534f8..67b18dfe0025 100644 --- a/fs/notify/fanotify/fanotify_user.c +++ b/fs/notify/fanotify/fanotify_user.c @@ -1192,16 +1192,15 @@ SYSCALL_DEFINE2(fanotify_init, unsigned int, flags, unsigned int, event_f_flags) return fd; } -/* Check if filesystem can encode a unique fid */ -static int fanotify_test_fid(struct path *path, __kernel_fsid_t *fsid) +static int fanotify_test_fsid(struct dentry *dentry, __kernel_fsid_t *fsid) { __kernel_fsid_t root_fsid; int err; /* - * Make sure path is not in filesystem with zero fsid (e.g. tmpfs). + * Make sure dentry is not of a filesystem with zero fsid (e.g. fuse). */ - err = vfs_get_fsid(path->dentry, fsid); + err = vfs_get_fsid(dentry, fsid); if (err) return err; @@ -1209,10 +1208,10 @@ static int fanotify_test_fid(struct path *path, __kernel_fsid_t *fsid) return -ENODEV; /* - * Make sure path is not inside a filesystem subvolume (e.g. btrfs) + * Make sure dentry is not of a filesystem subvolume (e.g. btrfs) * which uses a different fsid than sb root. */ - err = vfs_get_fsid(path->dentry->d_sb->s_root, &root_fsid); + err = vfs_get_fsid(dentry->d_sb->s_root, &root_fsid); if (err) return err; @@ -1220,6 +1219,12 @@ static int fanotify_test_fid(struct path *path, __kernel_fsid_t *fsid) root_fsid.val[1] != fsid->val[1]) return -EXDEV; + return 0; +} + +/* Check if filesystem can encode a unique fid */ +static int fanotify_test_fid(struct dentry *dentry) +{ /* * We need to make sure that the file system supports at least * encoding a file handle so user can use name_to_handle_at() to @@ -1227,8 +1232,8 @@ static int fanotify_test_fid(struct path *path, __kernel_fsid_t *fsid) * objects. However, name_to_handle_at() requires that the * filesystem also supports decoding file handles. */ - if (!path->dentry->d_sb->s_export_op || - !path->dentry->d_sb->s_export_op->fh_to_dentry) + if (!dentry->d_sb->s_export_op || + !dentry->d_sb->s_export_op->fh_to_dentry) return -EOPNOTSUPP; return 0; @@ -1379,7 +1384,11 @@ static int do_fanotify_mark(int fanotify_fd, unsigned int flags, __u64 mask, } if (fid_mode) { - ret = fanotify_test_fid(&path, &__fsid); + ret = fanotify_test_fsid(path.dentry, &__fsid); + if (ret) + goto path_put_and_out; + + ret = fanotify_test_fid(path.dentry); if (ret) goto path_put_and_out; -- 2.32.0