[PATCH] bpftool: fix control flow graph segfault during edge creation

[PATCH] bpftool: fix control flow graph segfault during edge creation

[Christoph Werle]

If the last instruction of a control flow graph building block is a
BPF_CALL, an incorrect edge with e->dst set to NULL is created and
results in a segfault during graph output.

Ensure that BPF_CALL as last instruction of a building block is handled
correctly and only generates a single edge unlike actual BPF_JUMP*
instructions.

Signed-off-by: Christoph Werle <christoph.werle@longjmp.de>
---
 tools/bpf/bpftool/cfg.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/bpf/bpftool/cfg.c b/tools/bpf/bpftool/cfg.c
index eec437cca2ea..e3785f9a697d 100644
--- a/tools/bpf/bpftool/cfg.c
+++ b/tools/bpf/bpftool/cfg.c
@@ -302,6 +302,7 @@ static bool func_add_bb_edges(struct func_node *func)
 
 		insn = bb->tail;
 		if (!is_jmp_insn(insn->code) ||
+		    BPF_OP(insn->code) == BPF_CALL ||
 		    BPF_OP(insn->code) == BPF_EXIT) {
 			e->dst = bb_next(bb);
 			e->flags |= EDGE_FLAG_FALLTHROUGH;
-- 
2.43.0

Re: [PATCH] bpftool: fix control flow graph segfault during edge creation

[Quentin Monnet]

On 08/01/2025 22:09, Christoph Werle wrote:
> If the last instruction of a control flow graph building block is a
> BPF_CALL, an incorrect edge with e->dst set to NULL is created and
> results in a segfault during graph output.
> 
> Ensure that BPF_CALL as last instruction of a building block is handled
> correctly and only generates a single edge unlike actual BPF_JUMP*
> instructions.
> 
> Signed-off-by: Christoph Werle <christoph.werle@longjmp.de>


Fixes: 0824611f9b38 ("tools: bpftool: partition basic-block for each function in the CFG")


> ---
>  tools/bpf/bpftool/cfg.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/tools/bpf/bpftool/cfg.c b/tools/bpf/bpftool/cfg.c
> index eec437cca2ea..e3785f9a697d 100644
> --- a/tools/bpf/bpftool/cfg.c
> +++ b/tools/bpf/bpftool/cfg.c
> @@ -302,6 +302,7 @@ static bool func_add_bb_edges(struct func_node *func)
>  
>  		insn = bb->tail;
>  		if (!is_jmp_insn(insn->code) ||
> +		    BPF_OP(insn->code) == BPF_CALL ||
>  		    BPF_OP(insn->code) == BPF_EXIT) {
>  			e->dst = bb_next(bb);
>  			e->flags |= EDGE_FLAG_FALLTHROUGH;


Thanks for this! It looks OK, would you have a minimal reproducer by any
chance?

Quentin

Re: [PATCH] bpftool: fix control flow graph segfault during edge creation

[christoph.werle]

Hello Quentin,

> Thanks for this! It looks OK, would you have a minimal reproducer by any
> chance?

here's a small example based on libbpf-bootstrap:

------------- reprex_edge_segfault.bpf.c
// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause

#include "vmlinux.h"
#include <bpf/bpf_helpers.h>

char LICENSE[] SEC("license") = "Dual BSD/GPL";

int __attribute__ ((noinline)) do_barf()
{
	bpf_printk("We're doomed\n");
	return 0;
}

SEC("tp/sched/sched_process_exec")
int handle__sched_process_exec(struct trace_event_raw_sched_process_exec *ctx)
{
    if (ctx->pid > 1000)
	    do_barf();

    return 0;
}

------------- reprex_edge_segfault.c
// SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause)

#include <unistd.h>
#include <bpf/libbpf.h>
#include <bpf/bpf.h>
#include "reprex_edge_segfault.skel.h"

int main(int argc, char **argv)
{
	struct reprex_edge_segfault_bpf *skel;
	int err=0;

	skel = reprex_edge_segfault_bpf__open();
	err = reprex_edge_segfault_bpf__load(skel);
	err = reprex_edge_segfault_bpf__attach(skel);

	while (true)
	    sleep(1);

	reprex_edge_segfault_bpf__destroy(skel);
	return -err;
}
--------------

Then just add reprex_edge_segfault to APPS variable in examples/c/Makefile.

Kind regards,
 Christoph

> Quentin Monnet <qmo@kernel.org> hat am 09.01.2025 19:19 CET geschrieben:
> 
>  
> On 08/01/2025 22:09, Christoph Werle wrote:
> > If the last instruction of a control flow graph building block is a
> > BPF_CALL, an incorrect edge with e->dst set to NULL is created and
> > results in a segfault during graph output.
> > 
> > Ensure that BPF_CALL as last instruction of a building block is handled
> > correctly and only generates a single edge unlike actual BPF_JUMP*
> > instructions.
> > 
> > Signed-off-by: Christoph Werle <christoph.werle@longjmp.de>
> 
> 
> Fixes: 0824611f9b38 ("tools: bpftool: partition basic-block for each function in the CFG")
> 
> 
> > ---
> >  tools/bpf/bpftool/cfg.c | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/tools/bpf/bpftool/cfg.c b/tools/bpf/bpftool/cfg.c
> > index eec437cca2ea..e3785f9a697d 100644
> > --- a/tools/bpf/bpftool/cfg.c
> > +++ b/tools/bpf/bpftool/cfg.c
> > @@ -302,6 +302,7 @@ static bool func_add_bb_edges(struct func_node *func)
> >  
> >  		insn = bb->tail;
> >  		if (!is_jmp_insn(insn->code) ||
> > +		    BPF_OP(insn->code) == BPF_CALL ||
> >  		    BPF_OP(insn->code) == BPF_EXIT) {
> >  			e->dst = bb_next(bb);
> >  			e->flags |= EDGE_FLAG_FALLTHROUGH;
> 
> 
> Thanks for this! It looks OK, would you have a minimal reproducer by any
> chance?
> 
> Quentin

Re: [PATCH] bpftool: fix control flow graph segfault during edge creation

[Quentin Monnet]

2025-01-10 13:57 UTC+0100 ~ christoph.werle@longjmp.de
> Hello Quentin,
> 
>> Thanks for this! It looks OK, would you have a minimal reproducer by any
>> chance?
> 
> here's a small example based on libbpf-bootstrap:
> 
> ------------- reprex_edge_segfault.bpf.c
> // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
> 
> #include "vmlinux.h"
> #include <bpf/bpf_helpers.h>
> 
> char LICENSE[] SEC("license") = "Dual BSD/GPL";
> 
> int __attribute__ ((noinline)) do_barf()
> {
> 	bpf_printk("We're doomed\n");
> 	return 0;
> }
> 
> SEC("tp/sched/sched_process_exec")
> int handle__sched_process_exec(struct trace_event_raw_sched_process_exec *ctx)
> {
>     if (ctx->pid > 1000)
> 	    do_barf();
> 
>     return 0;
> }
> 
> ------------- reprex_edge_segfault.c
> // SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause)
> 
> #include <unistd.h>
> #include <bpf/libbpf.h>
> #include <bpf/bpf.h>
> #include "reprex_edge_segfault.skel.h"
> 
> int main(int argc, char **argv)
> {
> 	struct reprex_edge_segfault_bpf *skel;
> 	int err=0;
> 
> 	skel = reprex_edge_segfault_bpf__open();
> 	err = reprex_edge_segfault_bpf__load(skel);
> 	err = reprex_edge_segfault_bpf__attach(skel);
> 
> 	while (true)
> 	    sleep(1);
> 
> 	reprex_edge_segfault_bpf__destroy(skel);
> 	return -err;
> }
> --------------
> 
> Then just add reprex_edge_segfault to APPS variable in examples/c/Makefile.
> 
> Kind regards,
>  Christoph


Thanks a lot! I could successfully reproduce the issue and test your patch.

Tested-by: Quentin Monnet <qmo@kernel.org>
Reviewed-by: Quentin Monnet <qmo@kernel.org>

Re: [PATCH] bpftool: fix control flow graph segfault during edge creation

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to bpf/bpf-next.git (master)
by Andrii Nakryiko <andrii@kernel.org>:

On Wed,  8 Jan 2025 23:09:37 +0100 you wrote:
> If the last instruction of a control flow graph building block is a
> BPF_CALL, an incorrect edge with e->dst set to NULL is created and
> results in a segfault during graph output.
> 
> Ensure that BPF_CALL as last instruction of a building block is handled
> correctly and only generates a single edge unlike actual BPF_JUMP*
> instructions.
> 
> [...]

Here is the summary with links:
  - bpftool: fix control flow graph segfault during edge creation
    https://git.kernel.org/bpf/bpf-next/c/defac894af93

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html