OSDN Git Service

tools, bpftool: Fix warning on ignored return value for 'read'
authorQuentin Monnet <quentin.monnet@netronome.com>
Tue, 19 Nov 2019 11:17:06 +0000 (11:17 +0000)
committerAlexei Starovoitov <ast@kernel.org>
Mon, 25 Nov 2019 00:58:44 +0000 (16:58 -0800)
When building bpftool, a warning was introduced by commit a94364603610
("bpftool: Allow to read btf as raw data"), because the return value
from a call to 'read()' is ignored. Let's address it.

Signed-off-by: Quentin Monnet <quentin.monnet@netronome.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Acked-by: Andrii Nakryiko <andriin@fb.com>
Link: https://lore.kernel.org/bpf/20191119111706.22440-1-quentin.monnet@netronome.com
tools/bpf/bpftool/btf.c

index a7b8bf2..e5bc97b 100644 (file)
@@ -428,15 +428,15 @@ exit_close:
 static bool is_btf_raw(const char *file)
 {
        __u16 magic = 0;
-       int fd;
+       int fd, nb_read;
 
        fd = open(file, O_RDONLY);
        if (fd < 0)
                return false;
 
-       read(fd, &magic, sizeof(magic));
+       nb_read = read(fd, &magic, sizeof(magic));
        close(fd);
-       return magic == BTF_MAGIC;
+       return nb_read == sizeof(magic) && magic == BTF_MAGIC;
 }
 
 static int do_dump(int argc, char **argv)