openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

libbpf: simplify two pieces of logic 

Extra check for type is unnecessary in first case.

Extra zeroing is unnecessary, as snprintf guarantees that it will
zero-terminate string.

Acked-by: Song Liu <songliubraving@fb.com>
Signed-off-by: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
This commit is contained in:
Andrii Nakryiko 2019-05-29 10:36:09 -07:00 committed by Daniel Borkmann
parent fba01a0689
commit 7e8c328c4e
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/lib/bpf/libbpf.c
View File

@ -1430,8 +1430,7 @@ bpf_program__collect_reloc(struct bpf_program *prog, GElf_Shdr *shdr,
if (maps[map_idx].libbpf_type != type) if (maps[map_idx].libbpf_type != type)
continue; continue;
if (type != LIBBPF_MAP_UNSPEC || if (type != LIBBPF_MAP_UNSPEC ||
(type == LIBBPF_MAP_UNSPEC && maps[map_idx].offset == sym.st_value) {
maps[map_idx].offset == sym.st_value)) {
pr_debug("relocation: find map %zd (%s) for insn %u\n", pr_debug("relocation: find map %zd (%s) for insn %u\n",
map_idx, maps[map_idx].name, insn_idx); map_idx, maps[map_idx].name, insn_idx);
break; break;
@ -2354,7 +2353,6 @@ struct bpf_object *bpf_object__open_buffer(void *obj_buf,
snprintf(tmp_name, sizeof(tmp_name), "%lx-%lx", snprintf(tmp_name, sizeof(tmp_name), "%lx-%lx",
(unsigned long)obj_buf, (unsigned long)obj_buf,
(unsigned long)obj_buf_sz); (unsigned long)obj_buf_sz);
tmp_name[sizeof(tmp_name) - 1] = '\0';
name = tmp_name; name = tmp_name;
} }
pr_debug("loading object '%s' from buffer\n", pr_debug("loading object '%s' from buffer\n",