| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20220112193152.3058718-4-haoluo@google.com>
Date: Wed, 12 Jan 2022 11:31:47 -0800
From: Hao Luo <haoluo@...gle.com>
To: Alexei Starovoitov <ast@...nel.org>,
Andrii Nakryiko <andrii@...nel.org>,
Daniel Borkmann <daniel@...earbox.net>
Cc: Martin KaFai Lau <kafai@...com>, Song Liu <songliubraving@...com>,
Yonghong Song <yhs@...com>, KP Singh <kpsingh@...nel.org>,
Shakeel Butt <shakeelb@...gle.com>,
Joe Burton <jevburton.kernel@...il.com>,
Tejun Heo <tj@...nel.org>, bpf@...r.kernel.org,
linux-kernel@...r.kernel.org, Hao Luo <haoluo@...gle.com>
Subject: [PATCH RESEND RFC bpf-next v1 3/8] bpf: Expose bpf object in kernfs
This patch extends bpf_obj_do_pin() to allow creating a new entry in
kernfs which references a bpf object. Different from pinning objects
in bpffs, the created kernfs node does not hold an extra reference to
the object, because kernfs by itself doesn't have a notification
mechanism to put the object when the kernfs node is gone. Therefore
this patch is not "pinning" the object, but rather "exposing" the
object in kernfs. The lifetime of the created kernfs node depends on
the lifetime of the bpf object, not the other way around.
More specifically, we allow a bpf object to be exposed to kernfs only
after it becomes "persistent" by pinning in bpffs. So the lifetime of
the created kernfs node is tied to the bpffs inode. When the object
is unpinned from bpffs, the kernfs nodes exposing the bpf object will
be removed automatically. It uses the bpf_watch_inode() interface
introduced in the previous patches. Because the kernfs nodes do not
hold extra references to the object, we can remove the nodes at any
time without worrying about reference leak.
Signed-off-by: Hao Luo <haoluo@...gle.com>
---
kernel/bpf/Makefile | 2 +-
kernel/bpf/inode.c | 43 +++++++++++++-------
kernel/bpf/inode.h | 11 ++++-
kernel/bpf/kernfs_node.c | 87 ++++++++++++++++++++++++++++++++++++++++
4 files changed, 126 insertions(+), 17 deletions(-)
create mode 100644 kernel/bpf/kernfs_node.c
diff --git a/kernel/bpf/Makefile b/kernel/bpf/Makefile
index c1a9be6a4b9f..b1abf0d94b5b 100644
--- a/kernel/bpf/Makefile
+++ b/kernel/bpf/Makefile
@@ -8,7 +8,7 @@ CFLAGS_core.o += $(call cc-disable-warning, override-init) $(cflags-nogcse-yy)
obj-$(CONFIG_BPF_SYSCALL) += syscall.o verifier.o inode.o helpers.o tnum.o bpf_iter.o map_iter.o task_iter.o prog_iter.o
obj-$(CONFIG_BPF_SYSCALL) += hashtab.o arraymap.o percpu_freelist.o bpf_lru_list.o lpm_trie.o map_in_map.o bloom_filter.o
-obj-$(CONFIG_BPF_SYSCALL) += local_storage.o queue_stack_maps.o ringbuf.o
+obj-$(CONFIG_BPF_SYSCALL) += local_storage.o queue_stack_maps.o ringbuf.o kernfs_node.o
obj-$(CONFIG_BPF_SYSCALL) += bpf_local_storage.o bpf_task_storage.o
obj-${CONFIG_BPF_LSM} += bpf_inode_storage.o
obj-$(CONFIG_BPF_SYSCALL) += disasm.o
diff --git a/kernel/bpf/inode.c b/kernel/bpf/inode.c
index 9ba10912cbf8..7e93e477b57c 100644
--- a/kernel/bpf/inode.c
+++ b/kernel/bpf/inode.c
@@ -580,6 +580,21 @@ static bool dentry_is_bpf_dir(struct dentry *dentry)
return d_inode(dentry)->i_op == &bpf_dir_iops;
}
+static int bpf_obj_do_pin_generic(struct dentry *dentry, umode_t mode,
+ void *obj, enum bpf_type type)
+{
+ switch (type) {
+ case BPF_TYPE_PROG:
+ return vfs_mkobj(dentry, mode, bpf_mkprog, obj);
+ case BPF_TYPE_MAP:
+ return vfs_mkobj(dentry, mode, bpf_mkmap, obj);
+ case BPF_TYPE_LINK:
+ return vfs_mkobj(dentry, mode, bpf_mklink, obj);
+ default:
+ return -EPERM;
+ }
+}
+
static int bpf_obj_do_pin(const char __user *pathname, void *raw,
enum bpf_type type)
{
@@ -598,22 +613,20 @@ static int bpf_obj_do_pin(const char __user *pathname, void *raw,
if (ret)
goto out;
- if (!dentry_is_bpf_dir(path.dentry)) {
- ret = -EPERM;
- goto out;
- }
+ if (dentry_is_kernfs_dir(path.dentry)) {
+ ret = bpf_obj_do_pin_kernfs(dentry, mode, raw, type);
- switch (type) {
- case BPF_TYPE_PROG:
- ret = vfs_mkobj(dentry, mode, bpf_mkprog, raw);
- break;
- case BPF_TYPE_MAP:
- ret = vfs_mkobj(dentry, mode, bpf_mkmap, raw);
- break;
- case BPF_TYPE_LINK:
- ret = vfs_mkobj(dentry, mode, bpf_mklink, raw);
- break;
- default:
+ /* Match bpf_fd_probe_obj(). bpf objects exposed to kernfs
+ * do not hold an active reference. The lifetime of the
+ * created kernfs node is tied to an inode in bpffs. So the
+ * kernfs node gets destroyed automatically when the object
+ * is unpinned from bpffs.
+ */
+ if (ret == 0)
+ bpf_any_put(raw, type);
+ } else if (dentry_is_bpf_dir(path.dentry)) {
+ ret = bpf_obj_do_pin_generic(dentry, mode, raw, type);
+ } else {
ret = -EPERM;
}
out:
diff --git a/kernel/bpf/inode.h b/kernel/bpf/inode.h
index e7fe8137be80..c12d385a3e2a 100644
--- a/kernel/bpf/inode.h
+++ b/kernel/bpf/inode.h
@@ -4,8 +4,10 @@
#ifndef __BPF_INODE_H_
#define __BPF_INODE_H_
+#include <linux/fs.h>
+
enum bpf_type {
- BPF_TYPE_UNSPEC = 0,
+ BPF_TYPE_UNSPEC = 0,
BPF_TYPE_PROG,
BPF_TYPE_MAP,
BPF_TYPE_LINK,
@@ -39,4 +41,11 @@ int bpf_watch_inode(struct inode *inode, const struct notify_ops *ops,
*/
struct inode *get_backing_inode(void *obj, enum bpf_type);
+/* Test whether a given dentry is a kernfs entry. */
+bool dentry_is_kernfs_dir(struct dentry *dentry);
+
+/* Expose bpf object to kernfs. Requires dentry to be in kernfs. */
+int bpf_obj_do_pin_kernfs(struct dentry *dentry, umode_t mode, void *obj,
+ enum bpf_type type);
+
#endif // __BPF_INODE_H_
diff --git a/kernel/bpf/kernfs_node.c b/kernel/bpf/kernfs_node.c
new file mode 100644
index 000000000000..c1c45f7b948b
--- /dev/null
+++ b/kernel/bpf/kernfs_node.c
@@ -0,0 +1,87 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Expose eBPF objects in kernfs file system.
+ */
+
+#include <linux/fs.h>
+#include <linux/kernfs.h>
+#include "inode.h"
+
+/* file_operations for kernfs file system */
+
+/* Handler when the watched inode is freed. */
+static void kn_watch_free_inode(void *obj, enum bpf_type type, void *kn)
+{
+ kernfs_remove(kn);
+
+ /* match get in bpf_obj_do_pin_kernfs */
+ kernfs_put(kn);
+}
+
+static const struct notify_ops notify_ops = {
+ .free_inode = kn_watch_free_inode,
+};
+
+/* Kernfs file operations for bpf created files. */
+static const struct kernfs_ops bpf_generic_ops = {
+};
+
+/* Test whether a given dentry is a kernfs entry. */
+bool dentry_is_kernfs_dir(struct dentry *dentry)
+{
+ return kernfs_node_from_dentry(dentry) != NULL;
+}
+
+/* Expose bpf object to kernfs. Requires dentry to exist in kernfs. */
+int bpf_obj_do_pin_kernfs(struct dentry *dentry, umode_t mode, void *obj,
+ enum bpf_type type)
+{
+ struct dentry *parent_dentry;
+ struct super_block *sb;
+ struct kernfs_node *parent_kn, *kn;
+ struct kernfs_root *root;
+ const struct kernfs_ops *ops;
+ struct inode *inode;
+ int ret;
+
+ sb = dentry->d_sb;
+ root = kernfs_root_from_sb(sb);
+ if (!root) /* Not a kernfs file system. */
+ return -EPERM;
+
+ parent_dentry = dentry->d_parent;
+ parent_kn = kernfs_node_from_dentry(parent_dentry);
+ if (WARN_ON(!parent_kn))
+ return -EPERM;
+
+ inode = get_backing_inode(obj, type);
+ if (!inode)
+ return -ENXIO;
+
+ ops = &bpf_generic_ops;
+ kn = __kernfs_create_file(parent_kn, dentry->d_iname, mode,
+ GLOBAL_ROOT_UID, GLOBAL_ROOT_GID,
+ 0, ops, inode, NULL, NULL);
+ if (IS_ERR(kn)) {
+ iput(inode);
+ return PTR_ERR(kn);
+ }
+
+ /* hold an active kn by bpffs inode. */
+ kernfs_get(kn);
+
+ /* Watch the backing inode of the object in bpffs. When the backing
+ * inode is freed, the created kernfs entry will be removed as well.
+ */
+ ret = bpf_watch_inode(inode, ¬ify_ops, kn);
+ if (ret) {
+ kernfs_put(kn);
+ kernfs_remove(kn);
+ iput(inode);
+ return ret;
+ }
+
+ kernfs_activate(kn);
+ iput(inode);
+ return 0;
+}
--
2.34.1.448.ga2b2bfdf31-goog
Powered by blists - more mailing lists