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

Commit 45a22f4c authored by Jan Kara's avatar Jan Kara
Browse files

inotify: Fix reporting of cookies for inotify events 



My rework of handling of notification events (namely commit 7053aee2
"fsnotify: do not share events between notification groups") broke
sending of cookies with inotify events. We didn't propagate the value
passed to fsnotify() properly and passed 4 uninitialized bytes to
userspace instead (so it is also an information leak). Sadly I didn't
notice this during my testing because inotify cookies aren't used very
much and LTP inotify tests ignore them.

Fix the problem by passing the cookie value properly.

Fixes: 7053aee2
Reported-by: default avatarVegard Nossum <vegard.nossum@oracle.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 6d0abeca

fs/notify/dnotify/dnotify.c

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static int dnotify_handle_event(struct fsnotify_group *group, 
				struct fsnotify_mark *inode_mark,

				struct fsnotify_mark *vfsmount_mark,

				u32 mask, void *data, int data_type,

				const unsigned char *file_name)

				const unsigned char *file_name, u32 cookie)

{

	struct dnotify_mark *dn_mark;

	struct dnotify_struct *dn;

fs/notify/fanotify/fanotify.c

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ static int fanotify_handle_event(struct fsnotify_group *group, 
				 struct fsnotify_mark *inode_mark,

				 struct fsnotify_mark *fanotify_mark,

				 u32 mask, void *data, int data_type,

				 const unsigned char *file_name)

				 const unsigned char *file_name, u32 cookie)

{

	int ret = 0;

	struct fanotify_event_info *event;

fs/notify/fsnotify.c

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ static int send_to_group(struct inode *to_tell, 


	return group->ops->handle_event(group, to_tell, inode_mark,

					vfsmount_mark, mask, data, data_is,

					file_name);

					file_name, cookie);

}



/*

fs/notify/inotify/inotify.h

+1 −1
Original line number Diff line number Diff line
@@ -27,6 +27,6 @@ extern int inotify_handle_event(struct fsnotify_group *group, 
				struct fsnotify_mark *inode_mark,

				struct fsnotify_mark *vfsmount_mark,

				u32 mask, void *data, int data_type,

				const unsigned char *file_name);

				const unsigned char *file_name, u32 cookie);



extern const struct fsnotify_ops inotify_fsnotify_ops;

fs/notify/inotify/inotify_fsnotify.c

+2 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ int inotify_handle_event(struct fsnotify_group *group, 
			 struct fsnotify_mark *inode_mark,

			 struct fsnotify_mark *vfsmount_mark,

			 u32 mask, void *data, int data_type,

			 const unsigned char *file_name)

			 const unsigned char *file_name, u32 cookie)

{

	struct inotify_inode_mark *i_mark;

	struct inotify_event_info *event;
@@ -103,6 +103,7 @@ int inotify_handle_event(struct fsnotify_group *group, 
	fsn_event = &event->fse;

	fsnotify_init_event(fsn_event, inode, mask);

	event->wd = i_mark->wd;

	event->sync_cookie = cookie;

	event->name_len = len;

	if (len)

		strcpy(event->name, file_name);