• Lino Sanfilippo's avatar
    fanotify: don't set FAN_ONDIR implicitly on a marks ignored mask · 66ba93c0
    Lino Sanfilippo authored
    Currently FAN_ONDIR is always set on a mark's ignored mask when the
    event mask is extended without FAN_MARK_ONDIR being set.  This may
    result in events for directories being ignored unexpectedly for call
    sequences like
      fanotify_mark(fd, FAN_MARK_ADD, FAN_OPEN | FAN_ONDIR , AT_FDCWD, "dir");
      fanotify_mark(fd, FAN_MARK_ADD, FAN_CLOSE, AT_FDCWD, "dir");
    Also FAN_MARK_ONDIR is only honored when adding events to a mark's mask,
    but not for event removal.  Fix both issues by not setting FAN_ONDIR
    implicitly on the ignore mask any more.  Instead treat FAN_ONDIR as any
    other event flag and require FAN_MARK_ONDIR to be set by the user for
    both event mask and ignore mask.  Furthermore take FAN_MARK_ONDIR into
    account when set for event removal.
    [akpm@linux-foundation.org: coding-style fixes]
    Signed-off-by: default avatarLino Sanfilippo <LinoSanfilippo@gmx.de>
    Reviewed-by: default avatarJan Kara <jack@suse.cz>
    Cc: Eric Paris <eparis@redhat.com>
    Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
    Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
fanotify_user.c 23.1 KB