From: Amir Goldstein <amir73il@gmail.com> To: Jan Kara <jack@suse.cz> Cc: linux-fsdevel@vger.kernel.org Subject: [PATCH v5 19/22] fanotify: report events with parent dir fid to sb/mount/non-dir marks Date: Thu, 16 Jul 2020 11:42:27 +0300 [thread overview] Message-ID: <20200716084230.30611-20-amir73il@gmail.com> (raw) In-Reply-To: <20200716084230.30611-1-amir73il@gmail.com> In a group with flag FAN_REPORT_DIR_FID, when adding an inode mark with FAN_EVENT_ON_CHILD, events on non-directory children are reported with the fid of the parent. When adding a filesystem or mount mark or mark on a non-dir inode, we want to report events that are "possible on child" (e.g. open/close) also with fid of the parent, as if the victim inode's parent is interested in events "on child". Some events, currently only FAN_MOVE_SELF, should be reported to a sb/mount/non-dir mark with parent fid even though they are not reported to a watching parent. To get the desired behavior we set the flag FAN_EVENT_ON_CHILD on all the sb/mount/non-dir mark masks in a group with FAN_REPORT_DIR_FID. Signed-off-by: Amir Goldstein <amir73il@gmail.com> --- fs/notify/fanotify/fanotify.c | 3 +-- fs/notify/fanotify/fanotify_user.c | 7 +++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/fs/notify/fanotify/fanotify.c b/fs/notify/fanotify/fanotify.c index 4cbdb40e0d54..09331b0acaf2 100644 --- a/fs/notify/fanotify/fanotify.c +++ b/fs/notify/fanotify/fanotify.c @@ -272,8 +272,7 @@ static u32 fanotify_group_event_mask(struct fsnotify_group *group, */ if (event_mask & FS_EVENT_ON_CHILD && type != FSNOTIFY_OBJ_TYPE_CHILD && - (type != FSNOTIFY_OBJ_TYPE_INODE || - !(mark->mask & FS_EVENT_ON_CHILD))) + !(mark->mask & FS_EVENT_ON_CHILD)) continue; marks_mask |= mark->mask; diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c index e494400711c9..7caa64d028ba 100644 --- a/fs/notify/fanotify/fanotify_user.c +++ b/fs/notify/fanotify/fanotify_user.c @@ -1220,6 +1220,13 @@ static int do_fanotify_mark(int fanotify_fd, unsigned int flags, __u64 mask, if (mnt || !S_ISDIR(inode->i_mode)) { mask &= ~FAN_EVENT_ON_CHILD; umask = FAN_EVENT_ON_CHILD; + /* + * If group needs to report parent fid, register for getting + * events with parent/name info for non-directory. + */ + if ((fid_mode & FAN_REPORT_DIR_FID) && + (flags & FAN_MARK_ADD) && !ignored) + mask |= FAN_EVENT_ON_CHILD; } /* create/update an inode mark */ -- 2.17.1
next prev parent reply other threads:[~2020-07-16 8:43 UTC|newest] Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-07-16 8:42 [PATCH v5 00/22] fanotify events with name info Amir Goldstein 2020-07-16 8:42 ` [PATCH v5 01/22] fanotify: generalize the handling of extra event flags Amir Goldstein 2020-07-16 8:42 ` [PATCH v5 02/22] fanotify: generalize merge logic of events on dir Amir Goldstein 2020-07-16 8:42 ` [PATCH v5 03/22] fanotify: distinguish between fid encode error and null fid Amir Goldstein 2020-07-16 8:42 ` [PATCH v5 04/22] fanotify: generalize test for FAN_REPORT_FID Amir Goldstein 2020-07-16 8:42 ` [PATCH v5 05/22] fanotify: mask out special event flags from ignored mask Amir Goldstein 2020-07-16 8:42 ` [PATCH v5 06/22] fanotify: prepare for implicit event flags in mark mask Amir Goldstein 2020-07-16 8:42 ` [PATCH v5 07/22] fanotify: use FAN_EVENT_ON_CHILD as implicit flag on sb/mount/non-dir marks Amir Goldstein 2020-07-16 8:42 ` [PATCH v5 08/22] fsnotify: add object type "child" to object type iterator Amir Goldstein 2020-07-16 8:42 ` [PATCH v5 09/22] fanotify: use struct fanotify_info to parcel the variable size buffer Amir Goldstein 2020-07-16 8:42 ` [PATCH v5 10/22] fanotify: no external fh buffer in fanotify_name_event Amir Goldstein 2020-07-16 12:44 ` Jan Kara 2020-07-16 13:30 ` Amir Goldstein 2020-07-16 8:42 ` [PATCH v5 11/22] dnotify: report both events on parent and child with single callback Amir Goldstein 2020-07-16 8:42 ` [PATCH v5 12/22] inotify: " Amir Goldstein 2020-07-16 12:52 ` Jan Kara 2020-07-16 14:25 ` Amir Goldstein 2020-07-16 15:17 ` Jan Kara 2020-07-16 8:42 ` [PATCH v5 13/22] fanotify: " Amir Goldstein 2020-07-16 8:42 ` [PATCH v5 14/22] fsnotify: send event to " Amir Goldstein 2020-07-16 8:42 ` [PATCH v5 15/22] fsnotify: send event with parent/name info to sb/mount/non-dir marks Amir Goldstein 2020-07-16 17:01 ` Jan Kara 2020-07-16 17:20 ` Amir Goldstein 2020-07-16 17:57 ` Jan Kara 2020-07-16 18:42 ` Amir Goldstein 2020-07-16 22:34 ` Jan Kara 2020-07-17 3:49 ` Amir Goldstein 2020-07-16 8:42 ` [PATCH v5 16/22] fsnotify: remove check that source dentry is positive Amir Goldstein 2020-07-16 13:13 ` Jan Kara 2020-07-16 13:29 ` Jan Kara 2020-07-16 13:54 ` Amir Goldstein 2020-07-16 14:06 ` Jan Kara 2020-07-16 8:42 ` [PATCH v5 17/22] fsnotify: send MOVE_SELF event with parent/name info Amir Goldstein 2020-07-16 13:45 ` Jan Kara 2020-07-16 13:59 ` Amir Goldstein 2020-07-16 14:10 ` Amir Goldstein 2020-07-16 15:57 ` Amir Goldstein 2020-07-16 8:42 ` [PATCH v5 18/22] fanotify: add basic support for FAN_REPORT_DIR_FID Amir Goldstein 2020-07-16 8:42 ` Amir Goldstein [this message] 2020-07-16 8:42 ` [PATCH v5 20/22] fanotify: add support for FAN_REPORT_NAME Amir Goldstein 2020-07-16 8:42 ` [PATCH v5 21/22] fanotify: report parent fid + name + child fid Amir Goldstein 2020-07-16 15:59 ` Jan Kara 2020-07-16 16:08 ` Amir Goldstein 2020-07-16 8:42 ` [PATCH v5 22/22] fanotify: report parent fid " Amir Goldstein 2020-07-16 17:13 ` [PATCH v5 00/22] fanotify events with name info Jan Kara
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200716084230.30611-20-amir73il@gmail.com \ --to=amir73il@gmail.com \ --cc=jack@suse.cz \ --cc=linux-fsdevel@vger.kernel.org \ --subject='Re: [PATCH v5 19/22] fanotify: report events with parent dir fid to sb/mount/non-dir marks' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).