diff options
Diffstat (limited to 'kernel/bpf/inode.c')
| -rw-r--r-- | kernel/bpf/inode.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/kernel/bpf/inode.c b/kernel/bpf/inode.c index a41343009ccc..ed13645bd80c 100644 --- a/kernel/bpf/inode.c +++ b/kernel/bpf/inode.c | |||
| @@ -429,13 +429,6 @@ int bpf_obj_pin_user(u32 ufd, const char __user *pathname) | |||
| 429 | ret = bpf_obj_do_pin(pname, raw, type); | 429 | ret = bpf_obj_do_pin(pname, raw, type); |
| 430 | if (ret != 0) | 430 | if (ret != 0) |
| 431 | bpf_any_put(raw, type); | 431 | bpf_any_put(raw, type); |
| 432 | if ((trace_bpf_obj_pin_prog_enabled() || | ||
| 433 | trace_bpf_obj_pin_map_enabled()) && !ret) { | ||
| 434 | if (type == BPF_TYPE_PROG) | ||
| 435 | trace_bpf_obj_pin_prog(raw, ufd, pname); | ||
| 436 | if (type == BPF_TYPE_MAP) | ||
| 437 | trace_bpf_obj_pin_map(raw, ufd, pname); | ||
| 438 | } | ||
| 439 | out: | 432 | out: |
| 440 | putname(pname); | 433 | putname(pname); |
| 441 | return ret; | 434 | return ret; |
| @@ -502,15 +495,8 @@ int bpf_obj_get_user(const char __user *pathname, int flags) | |||
| 502 | else | 495 | else |
| 503 | goto out; | 496 | goto out; |
| 504 | 497 | ||
| 505 | if (ret < 0) { | 498 | if (ret < 0) |
| 506 | bpf_any_put(raw, type); | 499 | bpf_any_put(raw, type); |
| 507 | } else if (trace_bpf_obj_get_prog_enabled() || | ||
| 508 | trace_bpf_obj_get_map_enabled()) { | ||
| 509 | if (type == BPF_TYPE_PROG) | ||
| 510 | trace_bpf_obj_get_prog(raw, ret, pname); | ||
| 511 | if (type == BPF_TYPE_MAP) | ||
| 512 | trace_bpf_obj_get_map(raw, ret, pname); | ||
| 513 | } | ||
| 514 | out: | 500 | out: |
| 515 | putname(pname); | 501 | putname(pname); |
| 516 | return ret; | 502 | return ret; |
