]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
samples: bpf: fix: seg fault with NULL pointer arg
authorDaniel T. Lee <danieltimlee@gmail.com>
Mon, 3 Dec 2018 10:39:30 +0000 (19:39 +0900)
committerDaniel Borkmann <daniel@iogearbox.net>
Mon, 3 Dec 2018 22:58:03 +0000 (23:58 +0100)
When NULL pointer accidentally passed to write_kprobe_events,
due to strlen(NULL), segmentation fault happens.
Changed code returns -1 to deal with this situation.

Bug issued with Smatch, static analysis.

Signed-off-by: Daniel T. Lee <danieltimlee@gmail.com>
Acked-by: Song Liu <songliubraving@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
samples/bpf/bpf_load.c

index 434ea34a59549d4e6f57698850443f2c50d6354a..eae7b635343d13182a4d458d3280464f6ffee4ca 100644 (file)
@@ -58,7 +58,9 @@ static int write_kprobe_events(const char *val)
 {
        int fd, ret, flags;
 
-       if ((val != NULL) && (val[0] == '\0'))
+       if (val == NULL)
+               return -1;
+       else if (val[0] == '\0')
                flags = O_WRONLY | O_TRUNC;
        else
                flags = O_WRONLY | O_APPEND;