Commit 9709bd54 authored by Gabriel Krisman Bertazi's avatar Gabriel Krisman Bertazi Committed by Jan Kara
Browse files

fanotify: Allow users to request FAN_FS_ERROR events 

Wire up the FAN_FS_ERROR event in the fanotify_mark syscall, allowing
user space to request the monitoring of FAN_FS_ERROR events.

These events are limited to filesystem marks, so check it is the
case in the syscall handler.

Link: https://lore.kernel.org/r/20211025192746.66445-29-krisman@collabora.com


Reviewed-by: default avatarAmir Goldstein <amir73il@gmail.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarGabriel Krisman Bertazi <krisman@collabora.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 130a3c74

fs/notify/fanotify/fanotify.c

+1 −1
Original line number Diff line number Diff line
@@ -822,7 +822,7 @@ static int fanotify_handle_event(struct fsnotify_group *group, u32 mask, 
	BUILD_BUG_ON(FAN_OPEN_EXEC_PERM != FS_OPEN_EXEC_PERM);

	BUILD_BUG_ON(FAN_FS_ERROR != FS_ERROR);



	BUILD_BUG_ON(HWEIGHT32(ALL_FANOTIFY_EVENT_BITS) != 19);

	BUILD_BUG_ON(HWEIGHT32(ALL_FANOTIFY_EVENT_BITS) != 20);



	mask = fanotify_group_event_mask(group, iter_info, mask, data,

					 data_type, dir);

fs/notify/fanotify/fanotify_user.c

+4 −0
Original line number Diff line number Diff line
@@ -1520,6 +1520,10 @@ static int do_fanotify_mark(int fanotify_fd, unsigned int flags, __u64 mask, 
	    group->priority == FS_PRIO_0)

		goto fput_and_out;



	if (mask & FAN_FS_ERROR &&

	    mark_type != FAN_MARK_FILESYSTEM)

		goto fput_and_out;



	/*

	 * Events that do not carry enough information to report

	 * event->fd require a group that supports reporting fid.  Those

include/linux/fanotify.h

+5 −1
Original line number Diff line number Diff line
@@ -91,9 +91,13 @@ extern struct ctl_table fanotify_table[]; /* for sysctl */ 
#define FANOTIFY_INODE_EVENTS	(FANOTIFY_DIRENT_EVENTS | \

				 FAN_ATTRIB | FAN_MOVE_SELF | FAN_DELETE_SELF)



/* Events that can only be reported with data type FSNOTIFY_EVENT_ERROR */

#define FANOTIFY_ERROR_EVENTS	(FAN_FS_ERROR)



/* Events that user can request to be notified on */

#define FANOTIFY_EVENTS		(FANOTIFY_PATH_EVENTS | \

				 FANOTIFY_INODE_EVENTS)

				 FANOTIFY_INODE_EVENTS | \

				 FANOTIFY_ERROR_EVENTS)



/* Events that require a permission response from user */

#define FANOTIFY_PERM_EVENTS	(FAN_OPEN_PERM | FAN_ACCESS_PERM | \