aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/bpf/syscall.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/bpf/syscall.c')
-rw-r--r--kernel/bpf/syscall.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index 536edc2be307..0d69449acbd0 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -354,10 +354,11 @@ static int find_prog_type(enum bpf_prog_type type, struct bpf_prog *prog)
354 list_for_each_entry(tl, &bpf_prog_types, list_node) { 354 list_for_each_entry(tl, &bpf_prog_types, list_node) {
355 if (tl->type == type) { 355 if (tl->type == type) {
356 prog->aux->ops = tl->ops; 356 prog->aux->ops = tl->ops;
357 prog->aux->prog_type = type; 357 prog->type = type;
358 return 0; 358 return 0;
359 } 359 }
360 } 360 }
361
361 return -EINVAL; 362 return -EINVAL;
362} 363}
363 364
@@ -508,7 +509,7 @@ static int bpf_prog_load(union bpf_attr *attr)
508 prog->jited = false; 509 prog->jited = false;
509 510
510 atomic_set(&prog->aux->refcnt, 1); 511 atomic_set(&prog->aux->refcnt, 1);
511 prog->aux->is_gpl_compatible = is_gpl; 512 prog->gpl_compatible = is_gpl;
512 513
513 /* find program type: socket_filter vs tracing_filter */ 514 /* find program type: socket_filter vs tracing_filter */
514 err = find_prog_type(type, prog); 515 err = find_prog_type(type, prog);
@@ -517,7 +518,6 @@ static int bpf_prog_load(union bpf_attr *attr)
517 518
518 /* run eBPF verifier */ 519 /* run eBPF verifier */
519 err = bpf_check(prog, attr); 520 err = bpf_check(prog, attr);
520
521 if (err < 0) 521 if (err < 0)
522 goto free_used_maps; 522 goto free_used_maps;
523 523
@@ -528,7 +528,6 @@ static int bpf_prog_load(union bpf_attr *attr)
528 bpf_prog_select_runtime(prog); 528 bpf_prog_select_runtime(prog);
529 529
530 err = anon_inode_getfd("bpf-prog", &bpf_prog_fops, prog, O_RDWR | O_CLOEXEC); 530 err = anon_inode_getfd("bpf-prog", &bpf_prog_fops, prog, O_RDWR | O_CLOEXEC);
531
532 if (err < 0) 531 if (err < 0)
533 /* failed to allocate fd */ 532 /* failed to allocate fd */
534 goto free_used_maps; 533 goto free_used_maps;