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

Commit 8442edc1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify 

* 'for-linus' of git://git.infradead.org/users/eparis/notify:
  inotify: update the group mask on mark addition
  inotify: fix length reporting and size checking
  inotify: do not send a block of zeros when no pathname is available
parents 825e1e23 750a8870

fs/notify/inotify/inotify_user.c

+14 −6
Original line number Diff line number Diff line
@@ -154,7 +154,8 @@ static struct fsnotify_event *get_one_event(struct fsnotify_group *group, 


	event = fsnotify_peek_notify_event(group);



	event_size += roundup(event->name_len, event_size);

	if (event->name_len)

		event_size += roundup(event->name_len + 1, event_size);



	if (event_size > count)

		return ERR_PTR(-EINVAL);
@@ -180,7 +181,7 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group, 
	struct fsnotify_event_private_data *fsn_priv;

	struct inotify_event_private_data *priv;

	size_t event_size = sizeof(struct inotify_event);

	size_t name_len;

	size_t name_len = 0;



	/* we get the inotify watch descriptor from the event private data */

	spin_lock(&event->lock);
@@ -196,9 +197,11 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group, 
		inotify_free_event_priv(fsn_priv);

	}



	/* round up event->name_len so it is a multiple of event_size

	/*

	 * round up event->name_len so it is a multiple of event_size

	 * plus an extra byte for the terminating '\0'.

	 */

	if (event->name_len)

		name_len = roundup(event->name_len + 1, event_size);

	inotify_event.len = name_len;
@@ -325,7 +328,8 @@ static long inotify_ioctl(struct file *file, unsigned int cmd, 
		list_for_each_entry(holder, &group->notification_list, event_list) {

			event = holder->event;

			send_len += sizeof(struct inotify_event);

			send_len += roundup(event->name_len,

			if (event->name_len)

				send_len += roundup(event->name_len + 1,

						sizeof(struct inotify_event));

		}

		mutex_unlock(&group->notification_mutex);
@@ -587,6 +591,10 @@ static int inotify_new_watch(struct fsnotify_group *group, 
	/* match the ref from fsnotify_init_markentry() */

	fsnotify_put_mark(&tmp_ientry->fsn_entry);



	/* if this mark added a new event update the group mask */

	if (mask & ~group->mask)

		fsnotify_recalc_group_mask(group);



out_err:

	if (ret < 0)

		kmem_cache_free(inotify_inode_mark_cachep, tmp_ientry);