All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2] samples: bpf: fix: seg fault with NULL pointer arg
@ 2018-12-03 10:39 Daniel T. Lee
  2018-12-03 18:51 ` Song Liu
  2018-12-03 22:59 ` Daniel Borkmann
  0 siblings, 2 replies; 3+ messages in thread
From: Daniel T. Lee @ 2018-12-03 10:39 UTC (permalink / raw)
  To: Daniel Borkmann, Alexei Starovoitov; +Cc: netdev

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>
---
 samples/bpf/bpf_load.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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;
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH v2] samples: bpf: fix: seg fault with NULL pointer arg
  2018-12-03 10:39 [PATCH v2] samples: bpf: fix: seg fault with NULL pointer arg Daniel T. Lee
@ 2018-12-03 18:51 ` Song Liu
  2018-12-03 22:59 ` Daniel Borkmann
  1 sibling, 0 replies; 3+ messages in thread
From: Song Liu @ 2018-12-03 18:51 UTC (permalink / raw)
  To: danieltimlee; +Cc: Daniel Borkmann, Alexei Starovoitov, Networking

On Mon, Dec 3, 2018 at 2:40 AM Daniel T. Lee <danieltimlee@gmail.com> wrote:
>
> 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>

> ---
>  samples/bpf/bpf_load.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> 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;
> --
> 2.17.1
>

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH v2] samples: bpf: fix: seg fault with NULL pointer arg
  2018-12-03 10:39 [PATCH v2] samples: bpf: fix: seg fault with NULL pointer arg Daniel T. Lee
  2018-12-03 18:51 ` Song Liu
@ 2018-12-03 22:59 ` Daniel Borkmann
  1 sibling, 0 replies; 3+ messages in thread
From: Daniel Borkmann @ 2018-12-03 22:59 UTC (permalink / raw)
  To: Daniel T. Lee, Alexei Starovoitov; +Cc: netdev

On 12/03/2018 11:39 AM, Daniel T. Lee wrote:
> 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>

Applied to bpf-next, thanks!

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2018-12-03 22:59 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-03 10:39 [PATCH v2] samples: bpf: fix: seg fault with NULL pointer arg Daniel T. Lee
2018-12-03 18:51 ` Song Liu
2018-12-03 22:59 ` Daniel Borkmann

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.