summaryrefslogtreecommitdiffstats
path: root/samples
diff options
context:
space:
mode:
authorDaniel T. Lee <danieltimlee@gmail.com>2018-12-03 19:39:30 +0900
committerDaniel Borkmann <daniel@iogearbox.net>2018-12-03 23:58:03 +0100
commitd59dd69d5576d699d7d3f5da0b4738c3a36d0133 (patch)
treee514889dba3908fda5eec6762540f06aca89262f /samples
parent90b1023f68c78b9b85e364250155776c8e421176 (diff)
downloadlinux-stable-d59dd69d5576d699d7d3f5da0b4738c3a36d0133.tar.gz
linux-stable-d59dd69d5576d699d7d3f5da0b4738c3a36d0133.tar.bz2
linux-stable-d59dd69d5576d699d7d3f5da0b4738c3a36d0133.zip
samples: bpf: fix: seg fault with NULL pointer arg
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>
Diffstat (limited to 'samples')
-rw-r--r--samples/bpf/bpf_load.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/samples/bpf/bpf_load.c b/samples/bpf/bpf_load.c
index 434ea34a5954..eae7b635343d 100644
--- a/samples/bpf/bpf_load.c
+++ b/samples/bpf/bpf_load.c
@@ -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;