bpftool: Fix NULL pointer dereference when pin {PROG, MAP, LINK} without FILE
authorPu Lehui <pulehui@huawei.com>
Wed, 2 Nov 2022 08:40:34 +0000 (16:40 +0800)
committerDaniel Borkmann <daniel@iogearbox.net>
Wed, 2 Nov 2022 11:05:42 +0000 (12:05 +0100)
When using bpftool to pin {PROG, MAP, LINK} without FILE,
segmentation fault will occur. The reson is that the lack
of FILE will cause strlen to trigger NULL pointer dereference.
The corresponding stacktrace is shown below:

do_pin
  do_pin_any
    do_pin_fd
      mount_bpffs_for_pin
        strlen(name) <- NULL pointer dereference

Fix it by adding validation to the common process.

Fixes: 75a1e792c335 ("tools: bpftool: Allow all prog/map handles for pinning objects")
Signed-off-by: Pu Lehui <pulehui@huawei.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Reviewed-by: Quentin Monnet <quentin@isovalent.com>
Link: https://lore.kernel.org/bpf/20221102084034.3342995-1-pulehui@huaweicloud.com
tools/bpf/bpftool/common.c

index 8727765..0cdb4f7 100644 (file)
@@ -300,6 +300,9 @@ int do_pin_any(int argc, char **argv, int (*get_fd)(int *, char ***))
        int err;
        int fd;
 
+       if (!REQ_ARGS(3))
+               return -EINVAL;
+
        fd = get_fd(&argc, &argv);
        if (fd < 0)
                return fd;