From: Aleksa Sarai <asarai@suse.de>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Tejun Heo <tj@kernel.org>, Li Zefan <lizefan@huawei.com>,
Johannes Weiner <hannes@cmpxchg.org>,
"Serge E. Hallyn" <serge.hallyn@ubuntu.com>,
Aditya Kali <adityakali@google.com>,
Chris Wilson <chris@chris-wilson.co.uk>
Cc: linux-kernel@vger.kernel.org, cgroups@vger.kernel.org,
Christian Brauner <cbrauner@suse.de>,
Aleksa Sarai <asarai@suse.de>,
dev@opencontainers.org
Subject: [PATCH v1 1/3] kernfs: add support for custom per-sb permission hooks
Date: Tue, 19 Jul 2016 02:18:14 +1000 [thread overview]
Message-ID: <20160718161816.13040-2-asarai@suse.de> (raw)
In-Reply-To: <20160718161816.13040-1-asarai@suse.de>
This allows for users of kernfs to create custom (and possibly less
restrictive) permission checks for kernfs_nodes. The default is
unchanged. This patch is part of the cgroupns unprivileged subtree
management patchset.
Cc: dev@opencontainers.org
Signed-off-by: Aleksa Sarai <asarai@suse.de>
---
fs/kernfs/inode.c | 13 ++++++++++++-
include/linux/kernfs.h | 3 +++
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/fs/kernfs/inode.c b/fs/kernfs/inode.c
index 63b925d5ba1e..e82b8e5aa643 100644
--- a/fs/kernfs/inode.c
+++ b/fs/kernfs/inode.c
@@ -364,15 +364,26 @@ void kernfs_evict_inode(struct inode *inode)
int kernfs_iop_permission(struct inode *inode, int mask)
{
struct kernfs_node *kn;
+ struct kernfs_syscall_ops *scops;
+ int ret;
if (mask & MAY_NOT_BLOCK)
return -ECHILD;
kn = inode->i_private;
+ if (!kernfs_get_active(kn))
+ return -ENODEV;
mutex_lock(&kernfs_mutex);
kernfs_refresh_inode(kn, inode);
mutex_unlock(&kernfs_mutex);
- return generic_permission(inode, mask);
+ scops = kernfs_root(kn)->syscall_ops;
+ if (unlikely(scops && scops->permission))
+ ret = scops->permission(inode, kn, mask);
+ else
+ ret = generic_permission(inode, mask);
+
+ kernfs_put_active(kn);
+ return ret;
}
diff --git a/include/linux/kernfs.h b/include/linux/kernfs.h
index 96356ef012de..373b5a888a81 100644
--- a/include/linux/kernfs.h
+++ b/include/linux/kernfs.h
@@ -16,6 +16,7 @@
#include <linux/rbtree.h>
#include <linux/atomic.h>
#include <linux/wait.h>
+#include <linux/fs.h>
struct file;
struct dentry;
@@ -154,6 +155,8 @@ struct kernfs_syscall_ops {
const char *new_name);
int (*show_path)(struct seq_file *sf, struct kernfs_node *kn,
struct kernfs_root *root);
+ int (*permission)(struct inode *inode, struct kernfs_node *kn,
+ int mask);
};
struct kernfs_root {
--
2.9.0
next prev parent reply other threads:[~2016-07-18 16:18 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-18 16:18 [PATCH v1 0/3] cgroup: allow for unprivileged management Aleksa Sarai
2016-07-18 16:18 ` Aleksa Sarai [this message]
2016-07-18 16:18 ` [PATCH v1 2/3] cgroup: allow for unprivileged subtree management Aleksa Sarai
2016-07-20 15:45 ` Tejun Heo
2016-07-20 22:59 ` Aleksa Sarai
2016-07-18 16:18 ` [PATCH v1 3/3] cgroup: relax common ancestor restriction for direct descendants Aleksa Sarai
2016-07-20 15:51 ` Tejun Heo
2016-07-20 22:58 ` Aleksa Sarai
2016-07-20 23:02 ` Tejun Heo
2016-07-20 23:18 ` Aleksa Sarai
2016-07-20 23:19 ` Tejun Heo
2016-07-21 7:49 ` Aleksa Sarai
2016-07-21 14:33 ` Serge E. Hallyn
2016-07-21 14:37 ` Aleksa Sarai
2016-07-21 15:01 ` Tejun Heo
2016-07-21 15:09 ` Serge E. Hallyn
2016-07-21 14:51 ` James Bottomley
2016-07-21 14:59 ` Tejun Heo
2016-07-21 15:07 ` Aleksa Sarai
2016-07-21 15:04 ` Tejun Heo
2016-07-21 14:52 ` Tejun Heo
2016-07-21 15:04 ` James Bottomley
2016-07-21 15:07 ` Tejun Heo
2016-07-21 15:16 ` James Bottomley
2016-07-21 15:26 ` Tejun Heo
2016-07-21 15:34 ` James Bottomley
2016-07-21 15:50 ` Tejun Heo
2016-07-21 18:16 ` James Bottomley
2016-07-21 21:06 ` Tejun Heo
2016-07-22 8:30 ` Aleksa Sarai
2016-07-25 18:38 ` Tejun Heo
2016-07-25 22:54 ` Serge E. Hallyn
2016-07-22 8:24 ` Aleksa Sarai
2016-07-25 18:44 ` Tejun Heo
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=20160718161816.13040-2-asarai@suse.de \
--to=asarai@suse.de \
--cc=adityakali@google.com \
--cc=cbrauner@suse.de \
--cc=cgroups@vger.kernel.org \
--cc=chris@chris-wilson.co.uk \
--cc=dev@opencontainers.org \
--cc=gregkh@linuxfoundation.org \
--cc=hannes@cmpxchg.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lizefan@huawei.com \
--cc=serge.hallyn@ubuntu.com \
--cc=tj@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).