Skip to content

Commit 0d5ee33

Browse files
WOnder93jankara
authored andcommitted
fanotify: avoid/silence premature LSM capability checks
Make sure calling capable()/ns_capable() actually leads to access denied when false is returned, because these functions emit an audit record when a Linux Security Module denies the capability, which makes it difficult to avoid allowing/silencing unnecessary permissions in security policies (namely with SELinux). Where the return value just used to set a flag, use the non-auditing ns_capable_noaudit() instead. Fixes: 7cea2a3 ("fanotify: support limited functionality for unprivileged users") Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com> Reviewed-by: Paul Moore <paul@paul-moore.com> Reviewed-by: Amir Goldstein <amir73il@gmail.com> Link: https://patch.msgid.link/20260216150625.793013-2-omosnace@redhat.com Signed-off-by: Jan Kara <jack@suse.cz>
1 parent 6a32093 commit 0d5ee33

1 file changed

Lines changed: 13 additions & 12 deletions

File tree

fs/notify/fanotify/fanotify_user.c

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1615,17 +1615,18 @@ SYSCALL_DEFINE2(fanotify_init, unsigned int, flags, unsigned int, event_f_flags)
16151615
pr_debug("%s: flags=%x event_f_flags=%x\n",
16161616
__func__, flags, event_f_flags);
16171617

1618-
if (!capable(CAP_SYS_ADMIN)) {
1619-
/*
1620-
* An unprivileged user can setup an fanotify group with
1621-
* limited functionality - an unprivileged group is limited to
1622-
* notification events with file handles or mount ids and it
1623-
* cannot use unlimited queue/marks.
1624-
*/
1625-
if ((flags & FANOTIFY_ADMIN_INIT_FLAGS) ||
1626-
!(flags & (FANOTIFY_FID_BITS | FAN_REPORT_MNT)))
1627-
return -EPERM;
1618+
/*
1619+
* An unprivileged user can setup an fanotify group with limited
1620+
* functionality - an unprivileged group is limited to notification
1621+
* events with file handles or mount ids and it cannot use unlimited
1622+
* queue/marks.
1623+
*/
1624+
if (((flags & FANOTIFY_ADMIN_INIT_FLAGS) ||
1625+
!(flags & (FANOTIFY_FID_BITS | FAN_REPORT_MNT))) &&
1626+
!capable(CAP_SYS_ADMIN))
1627+
return -EPERM;
16281628

1629+
if (!ns_capable_noaudit(&init_user_ns, CAP_SYS_ADMIN)) {
16291630
/*
16301631
* Setting the internal flag FANOTIFY_UNPRIV on the group
16311632
* prevents setting mount/filesystem marks on this group and
@@ -1990,8 +1991,8 @@ static int do_fanotify_mark(int fanotify_fd, unsigned int flags, __u64 mask,
19901991
* A user is allowed to setup sb/mount/mntns marks only if it is
19911992
* capable in the user ns where the group was created.
19921993
*/
1993-
if (!ns_capable(group->user_ns, CAP_SYS_ADMIN) &&
1994-
mark_type != FAN_MARK_INODE)
1994+
if (mark_type != FAN_MARK_INODE &&
1995+
!ns_capable(group->user_ns, CAP_SYS_ADMIN))
19951996
return -EPERM;
19961997

19971998
/*

0 commit comments

Comments
 (0)