From: Christian Brauner <christian@brauner.io>
To: jack@suse.cz, linux-fsdevel@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, amir73il@gmail.com,
Christian Brauner <christian@brauner.io>
Subject: [PATCH] fanotify: remove redundant capable(CAP_SYS_ADMIN)s
Date: Wed, 22 May 2019 18:31:50 +0200 [thread overview]
Message-ID: <20190522163150.16849-1-christian@brauner.io> (raw)
This removes two redundant capable(CAP_SYS_ADMIN) checks from
fanotify_init().
fanotify_init() guards the whole syscall with capable(CAP_SYS_ADMIN) at the
beginning. So the other two capable(CAP_SYS_ADMIN) checks are not needed.
Fixes: 5dd03f55fd2 ("fanotify: allow userspace to override max queue depth")
Fixes: ac7e22dcfaf ("fanotify: allow userspace to override max marks")
Signed-off-by: Christian Brauner <christian@brauner.io>
---
fs/notify/fanotify/fanotify_user.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
index a90bb19dcfa2..ec2739a66103 100644
--- a/fs/notify/fanotify/fanotify_user.c
+++ b/fs/notify/fanotify/fanotify_user.c
@@ -845,8 +845,6 @@ SYSCALL_DEFINE2(fanotify_init, unsigned int, flags, unsigned int, event_f_flags)
if (flags & FAN_UNLIMITED_QUEUE) {
fd = -EPERM;
- if (!capable(CAP_SYS_ADMIN))
- goto out_destroy_group;
group->max_events = UINT_MAX;
} else {
group->max_events = FANOTIFY_DEFAULT_MAX_EVENTS;
@@ -854,8 +852,6 @@ SYSCALL_DEFINE2(fanotify_init, unsigned int, flags, unsigned int, event_f_flags)
if (flags & FAN_UNLIMITED_MARKS) {
fd = -EPERM;
- if (!capable(CAP_SYS_ADMIN))
- goto out_destroy_group;
group->fanotify_data.max_marks = UINT_MAX;
} else {
group->fanotify_data.max_marks = FANOTIFY_DEFAULT_MAX_MARKS;
--
2.21.0
next reply other threads:[~2019-05-22 16:32 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-22 16:31 Christian Brauner [this message]
2019-05-22 18:29 ` [PATCH] fanotify: remove redundant capable(CAP_SYS_ADMIN)s Amir Goldstein
2019-05-22 18:57 ` Christian Brauner
2019-05-22 20:00 ` Amir Goldstein
2019-05-23 9:55 ` Christian Brauner
2019-05-23 10:25 ` Amir Goldstein
2019-05-23 10:42 ` Christian Brauner
2019-05-23 11:40 ` Amir Goldstein
2019-05-23 11:58 ` Christian Brauner
2019-05-23 13:16 ` Amir Goldstein
2019-05-23 13:35 ` Christian Brauner
2019-05-23 14:40 ` Jan Kara
2019-05-23 14:43 ` Christian Brauner
2019-05-23 15:15 ` Amir Goldstein
2019-06-05 10:26 ` Matthew Bobrowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190522163150.16849-1-christian@brauner.io \
--to=christian@brauner.io \
--cc=amir73il@gmail.com \
--cc=jack@suse.cz \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).