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: <20220211121145.35237-2-laoar.shao@gmail.com> Date: Fri, 11 Feb 2022 12:11:42 +0000 From: Yafang Shao <laoar.shao@...il.com> To: ast@...nel.org, daniel@...earbox.net, andrii@...nel.org, kafai@...com, songliubraving@...com, yhs@...com, john.fastabend@...il.com, kpsingh@...nel.org Cc: netdev@...r.kernel.org, bpf@...r.kernel.org, Yafang Shao <laoar.shao@...il.com> Subject: [PATCH 1/4] bpf: Add pin_name into struct bpf_prog_aux A new member pin_name is added into struct bpf_prog_aux, which will be set when the prog is set and cleared when the pinned file is removed. Signed-off-by: Yafang Shao <laoar.shao@...il.com> --- include/linux/bpf.h | 2 ++ include/uapi/linux/bpf.h | 1 + kernel/bpf/inode.c | 20 +++++++++++++++++++- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/include/linux/bpf.h b/include/linux/bpf.h index 0ceb25b..9cf8055 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -933,6 +933,8 @@ struct bpf_prog_aux { struct work_struct work; struct rcu_head rcu; }; + + char pin_name[BPF_PIN_NAME_LEN]; }; struct bpf_array_aux { diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index c14fed8..bada5cc 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -1217,6 +1217,7 @@ struct bpf_stack_build_id { }; #define BPF_OBJ_NAME_LEN 16U +#define BPF_PIN_NAME_LEN 64U union bpf_attr { struct { /* anonymous struct used by BPF_MAP_CREATE command */ diff --git a/kernel/bpf/inode.c b/kernel/bpf/inode.c index 4477ca8..f1a8811 100644 --- a/kernel/bpf/inode.c +++ b/kernel/bpf/inode.c @@ -437,6 +437,8 @@ static int bpf_iter_link_pin_kernel(struct dentry *parent, static int bpf_obj_do_pin(const char __user *pathname, void *raw, enum bpf_type type) { + struct bpf_prog_aux *aux; + struct bpf_prog *prog; struct dentry *dentry; struct inode *dir; struct path path; @@ -461,6 +463,10 @@ static int bpf_obj_do_pin(const char __user *pathname, void *raw, switch (type) { case BPF_TYPE_PROG: + prog = raw; + aux = prog->aux; + (void) strncpy_from_user(aux->pin_name, pathname, BPF_PIN_NAME_LEN); + aux->pin_name[BPF_PIN_NAME_LEN - 1] = '\0'; ret = vfs_mkobj(dentry, mode, bpf_mkprog, raw); break; case BPF_TYPE_MAP: @@ -611,12 +617,24 @@ static int bpf_show_options(struct seq_file *m, struct dentry *root) static void bpf_free_inode(struct inode *inode) { + struct bpf_prog_aux *aux; + struct bpf_prog *prog; enum bpf_type type; if (S_ISLNK(inode->i_mode)) kfree(inode->i_link); - if (!bpf_inode_type(inode, &type)) + if (!bpf_inode_type(inode, &type)) { + switch (type) { + case BPF_TYPE_PROG: + prog = inode->i_private; + aux = prog->aux; + aux->pin_name[0] = '\0'; + break; + default: + break; + } bpf_any_put(inode->i_private, type); + } free_inode_nonrcu(inode); } -- 1.8.3.1
Powered by blists - more mailing lists