summaryrefslogtreecommitdiffstats
path: root/tools/lib/bpf
diff options
context:
space:
mode:
authorAndrii Nakryiko <andriin@fb.com>2019-05-29 10:36:09 -0700
committerDaniel Borkmann <daniel@iogearbox.net>2019-05-30 01:23:35 +0200
commit7e8c328c4e96a0fc68d9f1264656683f7f1e12c1 (patch)
tree2998afeb82d3adf13d880b6e1b9917cafcc9c9f0 /tools/lib/bpf
parentfba01a0689a98613f5ee3b1569fd9321f3fde7bd (diff)
downloadlinux-stable-7e8c328c4e96a0fc68d9f1264656683f7f1e12c1.tar.gz
linux-stable-7e8c328c4e96a0fc68d9f1264656683f7f1e12c1.tar.bz2
linux-stable-7e8c328c4e96a0fc68d9f1264656683f7f1e12c1.zip
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>
Diffstat (limited to 'tools/lib/bpf')
-rw-r--r--tools/lib/bpf/libbpf.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index b43913fc8b1b..33cd59bf9e72 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -1430,8 +1430,7 @@ bpf_program__collect_reloc(struct bpf_program *prog, GElf_Shdr *shdr,
if (maps[map_idx].libbpf_type != type)
continue;
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",
map_idx, maps[map_idx].name, insn_idx);
break;
@@ -2354,7 +2353,6 @@ struct bpf_object *bpf_object__open_buffer(void *obj_buf,
snprintf(tmp_name, sizeof(tmp_name), "%lx-%lx",
(unsigned long)obj_buf,
(unsigned long)obj_buf_sz);
- tmp_name[sizeof(tmp_name) - 1] = '\0';
name = tmp_name;
}
pr_debug("loading object '%s' from buffer\n",