]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
bpf: clean up bpf_prog_get_info_by_fd()
authorSong Liu <songliubraving@fb.com>
Mon, 10 Dec 2018 19:17:50 +0000 (11:17 -0800)
committerAlexei Starovoitov <ast@kernel.org>
Mon, 10 Dec 2018 22:48:42 +0000 (14:48 -0800)
info.nr_jited_ksyms and info.nr_jited_func_lens cannot be 0 in these two
statements, so we don't need to check them.

Signed-off-by: Song Liu <songliubraving@fb.com>
Acked-by: Martin KaFai Lau <kafai@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
kernel/bpf/syscall.c

index 19c88cff78803b8c045bc0ec8cb8b6136b739974..a99a23bf59101816da169868238e9d3fc4bca287 100644 (file)
@@ -2209,7 +2209,7 @@ static int bpf_prog_get_info_by_fd(struct bpf_prog *prog,
 
        ulen = info.nr_jited_ksyms;
        info.nr_jited_ksyms = prog->aux->func_cnt ? : 1;
-       if (info.nr_jited_ksyms && ulen) {
+       if (ulen) {
                if (bpf_dump_raw_ok()) {
                        unsigned long ksym_addr;
                        u64 __user *user_ksyms;
@@ -2240,7 +2240,7 @@ static int bpf_prog_get_info_by_fd(struct bpf_prog *prog,
 
        ulen = info.nr_jited_func_lens;
        info.nr_jited_func_lens = prog->aux->func_cnt ? : 1;
-       if (info.nr_jited_func_lens && ulen) {
+       if (ulen) {
                if (bpf_dump_raw_ok()) {
                        u32 __user *user_lens;
                        u32 func_len, i;