Skip to contentSkip to conversation

samples: bpf: fix: seg fault with NULL pointer arg

PATCH Applied Daniel T. Lee 3 participants 3 messages Dec 3, 2018

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 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.

---
 samples/bpf/bpf_load.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
samples/bpf/bpf_load.c +3 -1
index 434ea34a5954..eae7b635343d 100644
@@ -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;
Signature · 1 line
2.17.1
Acked-by on v2 1/1
#1 lore raw
Quoted 8 lines · Daniel T. Lee

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.

Quoted 22 lines
---
 samples/bpf/bpf_load.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
samples/bpf/bpf_load.c +3 -2
index 434ea34a5954..eae7b635343d 100644
@@ -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;
--

2.17.1