summary refs log tree commit diff
path: root/tools/bpf
diff options
context:
space:
mode:
authorPu Lehui <pulehui@huawei.com>2022-11-02 16:40:34 +0800
committerDaniel Borkmann <daniel@iogearbox.net>2022-11-02 12:05:42 +0100
commit34de8e6e0e1f66e431abf4123934a2581cb5f133 (patch)
tree23eb3b181ecd27dc5e82f84abc76bd8316c40df8 /tools/bpf
parent8ec95b94716a1e4d126edc3fb2bc426a717e2dba (diff)
downloadlinux-34de8e6e0e1f66e431abf4123934a2581cb5f133.tar.gz
bpftool: Fix NULL pointer dereference when pin {PROG, MAP, LINK} without FILE
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
Diffstat (limited to 'tools/bpf')
-rw-r--r--tools/bpf/bpftool/common.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/bpf/bpftool/common.c b/tools/bpf/bpftool/common.c
index 8727765add88..0cdb4f711510 100644
--- a/tools/bpf/bpftool/common.c
+++ b/tools/bpf/bpftool/common.c
@@ -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;