From: Aaron Goidel <acgoide@tycho.nsa.gov>
To: Amir Goldstein <amir73il@gmail.com>
Cc: Paul Moore <paul@paul-moore.com>,
selinux@vger.kernel.org,
LSM List <linux-security-module@vger.kernel.org>,
linux-fsdevel <linux-fsdevel@vger.kernel.org>,
David Howells <dhowells@redhat.com>, Jan Kara <jack@suse.cz>,
James Morris <jmorris@namei.org>,
Stephen Smalley <sds@tycho.nsa.gov>,
linux-kernel <linux-kernel@vger.kernel.org>
Subject: Re: [Non-DoD Source] Re: [RFC PATCH v2] fanotify, inotify, dnotify, security: add security hook for fs notifications
Date: Tue, 23 Jul 2019 12:16:04 -0400 [thread overview]
Message-ID: <c74ad814-f188-37c6-9b3a-51178b538a2b@tycho.nsa.gov> (raw)
In-Reply-To: <CAOQ4uxjCR76nbV_Lmoegaq6NqovWZD-XWEVS-X3e=BtDdjKkXQ@mail.gmail.com>
On 7/18/19 12:16 PM, Amir Goldstein wrote:
> On Thu, Jul 18, 2019 at 5:31 PM Aaron Goidel <acgoide@tycho.nsa.gov> wrote:
>>
>> diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
>> index a90bb19dcfa2..9e3137badb6b 100644
>> --- a/fs/notify/fanotify/fanotify_user.c
>> +++ b/fs/notify/fanotify/fanotify_user.c
>> @@ -528,9 +528,10 @@ static const struct file_operations fanotify_fops = {
>> };
>>
>> static int fanotify_find_path(int dfd, const char __user *filename,
>> - struct path *path, unsigned int flags)
>> + struct path *path, unsigned int flags, __u64 mask)
>> {
>> int ret;
>> + unsigned int mark_type;
>>
>> pr_debug("%s: dfd=%d filename=%p flags=%x\n", __func__,
>> dfd, filename, flags);
>> @@ -567,8 +568,30 @@ static int fanotify_find_path(int dfd, const char __user *filename,
>>
>> /* you can only watch an inode if you have read permissions on it */
>> ret = inode_permission(path->dentry->d_inode, MAY_READ);
>> + if (ret) {
>> + path_put(path);
>> + goto out;
>> + }
>> +
>> + switch (flags & FANOTIFY_MARK_TYPE_BITS) {
>> + case FAN_MARK_MOUNT:
>> + mark_type = FSNOTIFY_OBJ_TYPE_VFSMOUNT;
>> + break;
>> + case FAN_MARK_FILESYSTEM:
>> + mark_type = FSNOTIFY_OBJ_TYPE_SB;
>> + break;
>> + case FAN_MARK_INODE:
>> + mark_type = FSNOTIFY_OBJ_TYPE_INODE;
>> + break;
>> + default:
>> + ret = -EINVAL;
>> + goto out;
>> + }
>> +
>> + ret = security_inode_notify(path->dentry->d_inode, mask, mark_type);
>
> If you prefer 3 hooks security_{inode,mount,sb}_notify()
> please place them in fanotify_add_{inode,mount,sb}_mark().
>
> If you prefer single hook with path argument, please pass path
> down to fanotify_add_mark() and call security_path_notify() from there,
> where you already have the object type argument.
>
I'm not clear on why you want me to move the hook call down to
fanotify_add_mark(). I'd prefer to keep it adjacent to the existing
inode_permission() call so that all the security checking occurs from
one place. Moving it down requires adding a path arg to that entire call
chain, even though it wouldn't otherwise be needed. And that raises the
question of whether to continue passing the mnt_sb, mnt, or inode
separately or just extract all those from the path inside of
fanotify_add_*_mark().
It also seems to destroy the parallelism with fanotify_remove_*_mark().
I also don't see any real benefit in splitting into three separate
hooks, especially as some security modules will want the path or inode
even for the mount or superblock cases, since they may have no relevant
security information for vfsmounts or superblocks.
--
Aaron
next prev parent reply other threads:[~2019-07-23 16:16 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-18 14:30 [RFC PATCH v2] fanotify, inotify, dnotify, security: add security hook for fs notifications Aaron Goidel
2019-07-18 16:16 ` Amir Goldstein
2019-07-23 16:16 ` Aaron Goidel [this message]
2019-07-23 18:49 ` [Non-DoD Source] " Amir Goldstein
2019-07-18 16:39 ` Casey Schaufler
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=c74ad814-f188-37c6-9b3a-51178b538a2b@tycho.nsa.gov \
--to=acgoide@tycho.nsa.gov \
--cc=amir73il@gmail.com \
--cc=dhowells@redhat.com \
--cc=jack@suse.cz \
--cc=jmorris@namei.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=paul@paul-moore.com \
--cc=sds@tycho.nsa.gov \
--cc=selinux@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).