2020-11-05 11:57:02

by Lorenz Bauer

Subject: [PATCH bpf] tools/bpftool: fix attaching flow dissector

My earlier patch to reject non-zero arguments to flow dissector attach
broke attaching via bpftool. Instead of 0 it uses -1 for target_fd.
Fix this by passing a zero argument when attaching the flow dissector.

Fixes: 1b514239e859 ("bpf: flow_dissector: Check value of unused flags to BPF_PROG_ATTACH")
Reported-by: Jiri Benc <[email protected]>
Signed-off-by: Lorenz Bauer <[email protected]>
---
tools/bpf/bpftool/prog.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c
index d942c1e3372c..acdb2c245f0a 100644
--- a/tools/bpf/bpftool/prog.c
+++ b/tools/bpf/bpftool/prog.c
@@ -940,7 +940,7 @@ static int parse_attach_detach_args(int argc, char **argv, int *progfd,
}

if (*attach_type == BPF_FLOW_DISSECTOR) {
- *mapfd = -1;
+ *mapfd = 0;
return 0;
}

--
2.25.1

2020-11-05 17:59:32

by Song Liu

Subject: Re: [PATCH bpf] tools/bpftool: fix attaching flow dissector

On Thu, Nov 5, 2020 at 3:54 AM Lorenz Bauer <[email protected]> wrote:
>
> My earlier patch to reject non-zero arguments to flow dissector attach
> broke attaching via bpftool. Instead of 0 it uses -1 for target_fd.
> Fix this by passing a zero argument when attaching the flow dissector.
>
> Fixes: 1b514239e859 ("bpf: flow_dissector: Check value of unused flags to BPF_PROG_ATTACH")
> Reported-by: Jiri Benc <[email protected]>
> Signed-off-by: Lorenz Bauer <[email protected]>

Acked-by: Song Liu <[email protected]>

> ---
> tools/bpf/bpftool/prog.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c
> index d942c1e3372c..acdb2c245f0a 100644
> --- a/tools/bpf/bpftool/prog.c
> +++ b/tools/bpf/bpftool/prog.c
> @@ -940,7 +940,7 @@ static int parse_attach_detach_args(int argc, char **argv, int *progfd,
> }
>
> if (*attach_type == BPF_FLOW_DISSECTOR) {
> - *mapfd = -1;
> + *mapfd = 0;
> return 0;
> }
>
> --
> 2.25.1
>

2020-11-06 02:32:29

by patchwork-bot+netdevbpf

Subject: Re: [PATCH bpf] tools/bpftool: fix attaching flow dissector

Hello:

This patch was applied to bpf/bpf.git (refs/heads/master):

On Thu, 5 Nov 2020 11:52:30 +0000 you wrote:
> My earlier patch to reject non-zero arguments to flow dissector attach
> broke attaching via bpftool. Instead of 0 it uses -1 for target_fd.
> Fix this by passing a zero argument when attaching the flow dissector.
>
> Fixes: 1b514239e859 ("bpf: flow_dissector: Check value of unused flags to BPF_PROG_ATTACH")
> Reported-by: Jiri Benc <[email protected]>
> Signed-off-by: Lorenz Bauer <[email protected]>
>
> [...]

Here is the summary with links:
- [bpf] tools/bpftool: fix attaching flow dissector
https://git.kernel.org/bpf/bpf/c/f9b7ff0d7f7a

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