]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
bpftool: Fix readlink usage in get_fd_type
authorViktor Malik <vmalik@redhat.com>
Wed, 29 Jan 2025 07:18:57 +0000 (08:18 +0100)
committerAlexei Starovoitov <ast@kernel.org>
Mon, 3 Feb 2025 11:33:51 +0000 (03:33 -0800)
The `readlink(path, buf, sizeof(buf))` call reads at most sizeof(buf)
bytes and *does not* append null-terminator to buf. With respect to
that, fix two pieces in get_fd_type:

1. Change the truncation check to contain sizeof(buf) rather than
   sizeof(path).
2. Append null-terminator to buf.

Reported by Coverity.

Signed-off-by: Viktor Malik <vmalik@redhat.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Reviewed-by: Quentin Monnet <qmo@kernel.org>
Link: https://lore.kernel.org/bpf/20250129071857.75182-1-vmalik@redhat.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
tools/bpf/bpftool/common.c

index 9b75639434b8157360ef08f82648beeb6f4cd940..0a764426d93586f07719b85104604759ca903c61 100644 (file)
@@ -461,10 +461,11 @@ int get_fd_type(int fd)
                p_err("can't read link type: %s", strerror(errno));
                return -1;
        }
-       if (n == sizeof(path)) {
+       if (n == sizeof(buf)) {
                p_err("can't read link type: path too long!");
                return -1;
        }
+       buf[n] = '\0';
 
        if (strstr(buf, "bpf-map"))
                return BPF_OBJ_MAP;