Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a8dd2db authored by Heinrich Schuchardt's avatar Heinrich Schuchardt Committed by Linus Torvalds
Browse files

fanotify: FAN_MARK_FLUSH: avoid having to provide a fake/invalid fd and path 

Originally from Tvrtko Ursulin (https://lkml.org/lkml/2011/1/12/112

)

Avoid having to provide a fake/invalid fd and path when flushing marks

Currently for a group to flush marks it has set it needs to provide a
fake or invalid (but resolvable) file descriptor and path when calling
fanotify_mark.  This patch pulls the flush handling a bit up so file
descriptor and path are completely ignored when flushing.

I reworked the patch to be applicable again (the signature of
fanotify_mark has changed since Tvrtko's work).

Signed-off-by: default avatarHeinrich Schuchardt <xypron.glpk@gmx.de>
Cc: Tvrtko Ursulin <tvrtko.ursulin@onelan.co.uk>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Acked-by: default avatarEric Paris <eparis@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3185a88c

fs/notify/fanotify/fanotify_user.c

+10 −7
Original line number Diff line number Diff line
@@ -813,6 +813,15 @@ SYSCALL_DEFINE5(fanotify_mark, int, fanotify_fd, unsigned int, flags, 
	    group->priority == FS_PRIO_0)

		goto fput_and_out;



	if (flags & FAN_MARK_FLUSH) {

		ret = 0;

		if (flags & FAN_MARK_MOUNT)

			fsnotify_clear_vfsmount_marks_by_group(group);

		else

			fsnotify_clear_inode_marks_by_group(group);

		goto fput_and_out;

	}



	ret = fanotify_find_path(dfd, pathname, &path, flags);

	if (ret)

		goto fput_and_out;
@@ -824,7 +833,7 @@ SYSCALL_DEFINE5(fanotify_mark, int, fanotify_fd, unsigned int, flags, 
		mnt = path.mnt;



	/* create/update an inode mark */

	switch (flags & (FAN_MARK_ADD | FAN_MARK_REMOVE | FAN_MARK_FLUSH)) {

	switch (flags & (FAN_MARK_ADD | FAN_MARK_REMOVE)) {

	case FAN_MARK_ADD:

		if (flags & FAN_MARK_MOUNT)

			ret = fanotify_add_vfsmount_mark(group, mnt, mask, flags);
@@ -837,12 +846,6 @@ SYSCALL_DEFINE5(fanotify_mark, int, fanotify_fd, unsigned int, flags, 
		else

			ret = fanotify_remove_inode_mark(group, inode, mask, flags);

		break;

	case FAN_MARK_FLUSH:

		if (flags & FAN_MARK_MOUNT)

			fsnotify_clear_vfsmount_marks_by_group(group);

		else

			fsnotify_clear_inode_marks_by_group(group);

		break;

	default:

		ret = -EINVAL;

	}