Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf

Alexei Starovoitov says: ==================== pull-request: bpf 2020-03-12 The following pull-request contains BPF updates for your *net* tree. We've added 12 non-merge commits during the last 8 day(s) which contain a total of 12 files changed, 161 insertions(+), 15 deletions(-). The main changes are: 1) Andrii fixed two bugs in cgroup-bpf. 2) John fixed sockmap. 3) Luke fixed x32 jit. 4) Martin fixed two issues in struct_ops. 5) Yonghong fixed bpf_send_signal. 6) Yoshiki fixed BTF enum. ====================

David S. Miller committed 6 years ago

Commit 242a6df2 parents 0d81a3f 90db6d712 files · +161 −15Browse files

Showing the changes to kernel (5 of 12 files). Show all

Unified · Split

5 files

kernel/bpf/bpf_struct_ops.c +11 −3
kernel/bpf/btf.c +1 −1
kernel/bpf/cgroup.c +5 −2
kernel/bpf/syscall.c +5 −0
kernel/trace/bpf_trace.c +1 −1

kernel/bpf/bpf_struct_ops.c+11−3

 	prev_state = cmpxchg(&st_map->kvalue.state,
 			     BPF_STRUCT_OPS_STATE_INUSE,
 			     BPF_STRUCT_OPS_STATE_TOBEFREE);
-	if (prev_state == BPF_STRUCT_OPS_STATE_INUSE) {
+	switch (prev_state) {
+	case BPF_STRUCT_OPS_STATE_INUSE:
 		st_map->st_ops->unreg(&st_map->kvalue.data);
 		if (refcount_dec_and_test(&st_map->kvalue.refcnt))
 			bpf_map_put(map);
+		return 0;
+	case BPF_STRUCT_OPS_STATE_TOBEFREE:
+		return -EINPROGRESS;
+	case BPF_STRUCT_OPS_STATE_INIT:
+		return -ENOENT;
+	default:
+		WARN_ON_ONCE(1);
+		/* Should never happen.  Treat it as not found. */
+		return -ENOENT;
 	}
-	return 0;
 }
 static void bpf_struct_ops_map_seq_show_elem(struct bpf_map *map, void *key,

kernel/bpf/btf.c+1−1

@@ -2418,7 +2418,7 @@ static int btf_enum_check_member(struct btf_verifier_env *env, · 2417 unmodified lines
2418		2418
2419	struct_size = struct_type->size;	2419	struct_size = struct_type->size;
2420	bytes_offset = BITS_ROUNDDOWN_BYTES(struct_bits_off);	2420	bytes_offset = BITS_ROUNDDOWN_BYTES(struct_bits_off);
2421	if (struct_size - bytes_offset < sizeof(int)) {	2421	if (struct_size - bytes_offset < member_type->size) {
2422	btf_verifier_log_member(env, struct_type, member,	2422	btf_verifier_log_member(env, struct_type, member,
2423	"Member exceeds struct_size");	2423	"Member exceeds struct_size");
2424	return -EINVAL;	2424	return -EINVAL;

kernel/bpf/cgroup.c+5−2

 	for (i = 0; i < NR; i++)
 		bpf_prog_array_free(arrays[i]);
+	for (p = cgroup_parent(cgrp); p; p = cgroup_parent(p))
+		cgroup_bpf_put(p);
 	percpu_ref_exit(&cgrp->bpf.refcnt);
 	return -ENOMEM;
 	u32 saved_flags = (flags & (BPF_F_ALLOW_OVERRIDE | BPF_F_ALLOW_MULTI));
 	struct list_head *progs = &cgrp->bpf.progs[type];
 	struct bpf_prog *old_prog = NULL;
-	struct bpf_cgroup_storage *storage[MAX_BPF_CGROUP_STORAGE_TYPE],
+	struct bpf_cgroup_storage *storage[MAX_BPF_CGROUP_STORAGE_TYPE] = {};
-		*old_storage[MAX_BPF_CGROUP_STORAGE_TYPE] = {NULL};
+	struct bpf_cgroup_storage *old_storage[MAX_BPF_CGROUP_STORAGE_TYPE] = {};
 	struct bpf_prog_list *pl, *replace_pl = NULL;
 	enum bpf_cgroup_storage_type stype;
 	int err;

kernel/bpf/syscall.c+5−0

 	if (IS_ERR(map))
 		return PTR_ERR(map);
+	if (map->map_type == BPF_MAP_TYPE_STRUCT_OPS) {
+		fdput(f);
+		return -ENOTSUPP;
+	}
 	mutex_lock(&map->freeze_mutex);
 	if (map->writecnt) {

kernel/trace/bpf_trace.c+1−1

@@ -732,7 +732,7 @@ static int bpf_send_signal_common(u32 sig, enum pid_type type) · 731 unmodified lines
732	if (unlikely(!nmi_uaccess_okay()))	732	if (unlikely(!nmi_uaccess_okay()))
733	return -EPERM;	733	return -EPERM;
734		734
735	if (in_nmi()) {	735	if (irqs_disabled()) {
736	/* Do an early check on signal validity. Otherwise,	736	/* Do an early check on signal validity. Otherwise,
737	* the error is lost in deferred irq_work.	737	* the error is lost in deferred irq_work.
738	*/	738	*/

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code