Commit a118449a authored Feb 10, 2015 by Lino Sanfilippo Committed by Linus Torvalds Feb 10, 2015

fanotify: only destroy mark when both mask and ignored_mask are cleared



In fanotify_mark_remove_from_mask() a mark is destroyed if only one of
both bitmasks (mask or ignored_mask) of a mark is cleared.  However the
other mask may still be set and contain information that should not be
lost.  So only destroy a mark if both masks are cleared.

Signed-off-by: Lino Sanfilippo <LinoSanfilippo@gmx.de>
Reviewed-by: Jan Kara <jack@suse.cz>
Cc: Eric Paris <eparis@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent ece84b39

fs/notify/fanotify/fanotify_user.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -497,10 +497,9 @@ static __u32 fanotify_mark_remove_from_mask(struct fsnotify_mark *fsn_mark,
		oldmask = fsn_mark->ignored_mask;
		fsnotify_set_mark_ignored_mask_locked(fsn_mark, (oldmask & ~mask));
		}
		*destroy = !(fsn_mark->mask \| fsn_mark->ignored_mask);
		spin_unlock(&fsn_mark->lock);

		*destroy = !(oldmask & ~mask);

		return mask & oldmask;
		}