diff options
| author | Vinod Koul <vkoul@kernel.org> | 2020-09-11 15:15:36 +0300 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2020-09-11 15:15:36 +0300 |
| commit | 4c80e9323967125ab8aa7c271ccc7624abc08832 (patch) | |
| tree | c9881b5814c184aa0c1cb58c6383beab9173e388 /kernel/bpf/syscall.c | |
| parent | ef759e4a28c88965972c815af6023f41bd733316 (diff) | |
| parent | f4d51dffc6c01a9e94650d95ce0104964f8ae822 (diff) | |
| download | linux-4c80e9323967125ab8aa7c271ccc7624abc08832.tar.xz | |
Merge tag 'v5.9-rc4' into next
Linux 5.9-rc4
Diffstat (limited to 'kernel/bpf/syscall.c')
| -rw-r--r-- | kernel/bpf/syscall.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index 86299a292214..b999e7ff2583 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -2029,7 +2029,7 @@ bpf_prog_load_check_attach(enum bpf_prog_type prog_type, case BPF_PROG_TYPE_EXT: if (expected_attach_type) return -EINVAL; - /* fallthrough */ + fallthrough; default: return 0; } @@ -2634,7 +2634,7 @@ static int bpf_raw_tp_link_fill_link_info(const struct bpf_link *link, u32 ulen = info->raw_tracepoint.tp_name_len; size_t tp_len = strlen(tp_name); - if (ulen && !ubuf) + if (!ulen ^ !ubuf) return -EINVAL; info->raw_tracepoint.tp_name_len = tp_len + 1; |