Commit c73c6702 authored by Amir Goldstein's avatar Amir Goldstein Committed by Jan Kara
Browse files

fanotify: fix flush of mntns marks 



fanotify_mark(fd, FAN_MARK_FLUSH | FAN_MARK_MNTNS, ...) incorrectly
ends up causing removal inode marks.

Fixes: 0f46d81f ("fanotify: notify on mount attach and detach")
Signed-off-by: default avatarAmir Goldstein <amir73il@gmail.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Link: https://patch.msgid.link/20250418193903.2607617-2-amir73il@gmail.com
parent 9c32cda4

fs/notify/fanotify/fanotify_user.c

+1 −6
Original line number Diff line number Diff line
@@ -1961,12 +1961,7 @@ static int do_fanotify_mark(int fanotify_fd, unsigned int flags, __u64 mask, 
		return -EINVAL;



	if (mark_cmd == FAN_MARK_FLUSH) {

		if (mark_type == FAN_MARK_MOUNT)

			fsnotify_clear_vfsmount_marks_by_group(group);

		else if (mark_type == FAN_MARK_FILESYSTEM)

			fsnotify_clear_sb_marks_by_group(group);

		else

			fsnotify_clear_inode_marks_by_group(group);

		fsnotify_clear_marks_by_group(group, obj_type);

		return 0;

	}

include/linux/fsnotify_backend.h

+0 −15
Original line number Diff line number Diff line
@@ -907,21 +907,6 @@ extern void fsnotify_wait_marks_destroyed(void); 
/* Clear all of the marks of a group attached to a given object type */

extern void fsnotify_clear_marks_by_group(struct fsnotify_group *group,

					  unsigned int obj_type);

/* run all the marks in a group, and clear all of the vfsmount marks */

static inline void fsnotify_clear_vfsmount_marks_by_group(struct fsnotify_group *group)

{

	fsnotify_clear_marks_by_group(group, FSNOTIFY_OBJ_TYPE_VFSMOUNT);

}

/* run all the marks in a group, and clear all of the inode marks */

static inline void fsnotify_clear_inode_marks_by_group(struct fsnotify_group *group)

{

	fsnotify_clear_marks_by_group(group, FSNOTIFY_OBJ_TYPE_INODE);

}

/* run all the marks in a group, and clear all of the sn marks */

static inline void fsnotify_clear_sb_marks_by_group(struct fsnotify_group *group)

{

	fsnotify_clear_marks_by_group(group, FSNOTIFY_OBJ_TYPE_SB);

}

extern void fsnotify_get_mark(struct fsnotify_mark *mark);

extern void fsnotify_put_mark(struct fsnotify_mark *mark);

extern void fsnotify_finish_user_wait(struct fsnotify_iter_info *iter_info);