In mark_remove_from_mask() the mark is destroyed regardless of whether the event mask or ignore mask is cleared. We should only destroy the mark if the event mask is cleared. Signed-off-by: Lino Sanfilippo <LinoSanfilippo@xxxxxx> --- fs/notify/fanotify/fanotify_user.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Please apply this after patch "Dont allow a mask of 0 if setting or removing a mark" which i sent today. diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c index 207cdeb..c9143a0 100644 --- a/fs/notify/fanotify/fanotify_user.c +++ b/fs/notify/fanotify/fanotify_user.c @@ -518,7 +518,7 @@ static __u32 fanotify_mark_remove_from_mask(struct fsnotify_mark *fsn_mark, } spin_unlock(&fsn_mark->lock); - if (!(oldmask & ~mask)) + if (!(flags & FAN_MARK_IGNORED_MASK) && !(oldmask & ~mask)) fsnotify_destroy_mark(fsn_mark); return mask & oldmask; -- 1.5.6.5 -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
