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

Commit 7d131623 authored by Eric Paris's avatar Eric Paris
Browse files

fanotify: fill in the metadata_len field on struct fanotify_event_metadata 



The fanotify_event_metadata now has a field which is supposed to
indicate the length of the metadata portion of the event.  Fill in that
field as well.

Based-in-part-on-patch-by: default avatarAlexey Zaytsev <alexey.zaytsev@gmail.com>
Signed-off-by: default avatarEric Paris <eparis@redhat.com>
parent 62731fa0

fs/notify/fanotify/fanotify_user.c

+4 −2
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ static int fill_event_metadata(struct fsnotify_group *group, 
		 group, metadata, event);



	metadata->event_len = FAN_EVENT_METADATA_LEN;

	metadata->metadata_len = FAN_EVENT_METADATA_LEN;

	metadata->vers = FANOTIFY_METADATA_VERSION;

	metadata->mask = event->mask & FAN_ALL_OUTGOING_EVENTS;

	metadata->pid = pid_vnr(event->tgid);
@@ -275,10 +276,11 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group, 
		goto out_close_fd;



	ret = -EFAULT;

	if (copy_to_user(buf, &fanotify_event_metadata, FAN_EVENT_METADATA_LEN))

	if (copy_to_user(buf, &fanotify_event_metadata,

			 fanotify_event_metadata.event_len))

		goto out_kill_access_response;



	return FAN_EVENT_METADATA_LEN;

	return fanotify_event_metadata.event_len;



out_kill_access_response:

	remove_access_response(group, event, fd);