Commit 9f0d793b52eb2266359661369ef6303838904855

Authored by Eric Paris
1 parent 2fdc246aaf

fsnotify: do not set group for a mark before it is on the i_list

fsnotify_add_mark is supposed to add a mark to the g_list and i_list and to
set the group and inode for the mark.  fsnotify_destroy_mark_by_entry uses
the fact that ->group != NULL to know if this group should be destroyed or
if it's already been done.

But fsnotify_add_mark sets the group and inode before it actually adds the
mark to the i_list and g_list.  This can result in a race in inotify, it
requires 3 threads.

sys_inotify_add_watch("file")	sys_inotify_add_watch("file")	sys_inotify_rm_watch([a])
inotify_update_watch()
inotify_new_watch()
inotify_add_to_idr()
   ^--- returns wd = [a]
				inotfiy_update_watch()
				inotify_new_watch()
				inotify_add_to_idr()
				fsnotify_add_mark()
				   ^--- returns wd = [b]
				returns to userspace;
								inotify_idr_find([a])
								   ^--- gives us the pointer from task 1
fsnotify_add_mark()
   ^--- this is going to set the mark->group and mark->inode fields, but will
return -EEXIST because of the race with [b].
								fsnotify_destroy_mark()
								   ^--- since ->group != NULL we call back
									into inotify_freeing_mark() which calls
								inotify_remove_from_idr([a])

since fsnotify_add_mark() failed we call:
inotify_remove_from_idr([a])     <------WHOOPS it's not in the idr, this could
					have been any entry added later!

The fix is to make sure we don't set mark->group until we are sure the mark is
on the inode and fsnotify_add_mark will return success.

Signed-off-by: Eric Paris <eparis@redhat.com>

Showing 1 changed file with 3 additions and 3 deletions Side-by-side Diff

fs/notify/inode_mark.c
... ... @@ -324,11 +324,11 @@
324 324 spin_lock(&group->mark_lock);
325 325 spin_lock(&inode->i_lock);
326 326  
327   - entry->group = group;
328   - entry->inode = inode;
329   -
330 327 lentry = fsnotify_find_mark_entry(group, inode);
331 328 if (!lentry) {
  329 + entry->group = group;
  330 + entry->inode = inode;
  331 +
332 332 hlist_add_head(&entry->i_list, &inode->i_fsnotify_mark_entries);
333 333 list_add(&entry->g_list, &group->mark_entries);
334 334