bpf.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH bpf-next] libbpf: Remove redundant check in btf_ext__new()
@ 2022-03-12 17:13 Yuntao Wang
  2022-03-15 18:36 ` Andrii Nakryiko
  0 siblings, 1 reply; 6+ messages in thread
From: Yuntao Wang @ 2022-03-12 17:13 UTC (permalink / raw)
  To: Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko
  Cc: Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
	KP Singh, netdev, bpf, linux-kernel, Yuntao Wang

Since 'core_relo_len' is the last field of 'struct btf_ext_header', if
'xxx->hdr_len' is not less than 'offsetofend(xxx, core_relo_len)', then
'xxx->hdr_len' must also be not less than 'offsetofend(xxx, line_info_len)'.

We can check 'xxx->hdr_len < offsetofend(xxx, core_relo_len)' first, if it
passes, the 'xxx->hdr_len < offsetofend(xxx, line_info_len)' check will be
redundant, it can be removed.

Signed-off-by: Yuntao Wang <ytcoode@gmail.com>
---
 tools/lib/bpf/btf.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c
index 1383e26c5d1f..d55b44124c3e 100644
--- a/tools/lib/bpf/btf.c
+++ b/tools/lib/bpf/btf.c
@@ -2813,7 +2813,7 @@ struct btf_ext *btf_ext__new(const __u8 *data, __u32 size)
 	if (err)
 		goto done;
 
-	if (btf_ext->hdr->hdr_len < offsetofend(struct btf_ext_header, line_info_len)) {
+	if (btf_ext->hdr->hdr_len < offsetofend(struct btf_ext_header, core_relo_len)) {
 		err = -EINVAL;
 		goto done;
 	}
@@ -2826,11 +2826,6 @@ struct btf_ext *btf_ext__new(const __u8 *data, __u32 size)
 	if (err)
 		goto done;
 
-	if (btf_ext->hdr->hdr_len < offsetofend(struct btf_ext_header, core_relo_len)) {
-		err = -EINVAL;
-		goto done;
-	}
-
 	err = btf_ext_setup_core_relos(btf_ext);
 	if (err)
 		goto done;
-- 
2.35.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH bpf-next] libbpf: Remove redundant check in btf_ext__new()
  2022-03-12 17:13 [PATCH bpf-next] libbpf: Remove redundant check in btf_ext__new() Yuntao Wang
@ 2022-03-15 18:36 ` Andrii Nakryiko
  2022-03-16 14:52   ` [PATCH bpf-next v2] libbpf: Don't return -EINVAL if hdr_len < offsetofend(core_relo_len) Yuntao Wang
  0 siblings, 1 reply; 6+ messages in thread
From: Andrii Nakryiko @ 2022-03-15 18:36 UTC (permalink / raw)
  To: Yuntao Wang
  Cc: Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
	Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
	KP Singh, Networking, bpf, open list

On Sat, Mar 12, 2022 at 9:14 AM Yuntao Wang <ytcoode@gmail.com> wrote:
>
> Since 'core_relo_len' is the last field of 'struct btf_ext_header', if
> 'xxx->hdr_len' is not less than 'offsetofend(xxx, core_relo_len)', then
> 'xxx->hdr_len' must also be not less than 'offsetofend(xxx, line_info_len)'.
>
> We can check 'xxx->hdr_len < offsetofend(xxx, core_relo_len)' first, if it
> passes, the 'xxx->hdr_len < offsetofend(xxx, line_info_len)' check will be
> redundant, it can be removed.
>
> Signed-off-by: Yuntao Wang <ytcoode@gmail.com>
> ---
>  tools/lib/bpf/btf.c | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c
> index 1383e26c5d1f..d55b44124c3e 100644
> --- a/tools/lib/bpf/btf.c
> +++ b/tools/lib/bpf/btf.c
> @@ -2813,7 +2813,7 @@ struct btf_ext *btf_ext__new(const __u8 *data, __u32 size)
>         if (err)
>                 goto done;
>
> -       if (btf_ext->hdr->hdr_len < offsetofend(struct btf_ext_header, line_info_len)) {
> +       if (btf_ext->hdr->hdr_len < offsetofend(struct btf_ext_header, core_relo_len)) {
>                 err = -EINVAL;
>                 goto done;
>         }
> @@ -2826,11 +2826,6 @@ struct btf_ext *btf_ext__new(const __u8 *data, __u32 size)
>         if (err)
>                 goto done;
>
> -       if (btf_ext->hdr->hdr_len < offsetofend(struct btf_ext_header, core_relo_len)) {
> -               err = -EINVAL;
> -               goto done;
> -       }

it seems like it's actually a bug. If header is smaller then core
relos parsing should be skipped, I think. Maybe let's fix that
instead?

basically the logic should be:

1. if size of header is exactly == offsetof(core_relo_off) then skip core relos
2. otherwise check that it has enough size to cover core_relo_off and
core_relo_len, and error out if not
3. otherwise proceed to parsing core relos

> -
>         err = btf_ext_setup_core_relos(btf_ext);
>         if (err)
>                 goto done;
> --
> 2.35.1
>

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [PATCH bpf-next v2] libbpf: Don't return -EINVAL if hdr_len < offsetofend(core_relo_len)
  2022-03-15 18:36 ` Andrii Nakryiko
@ 2022-03-16 14:52   ` Yuntao Wang
  2022-04-03 23:10     ` Andrii Nakryiko
  0 siblings, 1 reply; 6+ messages in thread
From: Yuntao Wang @ 2022-03-16 14:52 UTC (permalink / raw)
  To: andrii.nakryiko
  Cc: andrii, ast, bpf, daniel, john.fastabend, kafai, kpsingh,
	linux-kernel, netdev, songliubraving, yhs, ytcoode, toke

Since core relos is an optional part of the .BTF.ext ELF section, we should
skip parsing it instead of returning -EINVAL if header size is less than
offsetofend(struct btf_ext_header, core_relo_len).

Fixes: e9fc3ce99b34 ("libbpf: Streamline error reporting for high-level APIs")
Signed-off-by: Yuntao Wang <ytcoode@gmail.com>
---
v1 -> v2: skip core relos if hdr_len < offsetofend(core_relo_len)

 tools/lib/bpf/btf.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c
index 1383e26c5d1f..9b7196b21498 100644
--- a/tools/lib/bpf/btf.c
+++ b/tools/lib/bpf/btf.c
@@ -2826,10 +2826,8 @@ struct btf_ext *btf_ext__new(const __u8 *data, __u32 size)
 	if (err)
 		goto done;
 
-	if (btf_ext->hdr->hdr_len < offsetofend(struct btf_ext_header, core_relo_len)) {
-		err = -EINVAL;
-		goto done;
-	}
+	if (btf_ext->hdr->hdr_len < offsetofend(struct btf_ext_header, core_relo_len))
+		goto done; // skip core relos parsing
 
 	err = btf_ext_setup_core_relos(btf_ext);
 	if (err)
-- 
2.35.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH bpf-next v2] libbpf: Don't return -EINVAL if hdr_len < offsetofend(core_relo_len)
  2022-03-16 14:52   ` [PATCH bpf-next v2] libbpf: Don't return -EINVAL if hdr_len < offsetofend(core_relo_len) Yuntao Wang
@ 2022-04-03 23:10     ` Andrii Nakryiko
  2022-04-04  0:53       ` [PATCH bpf-next v3] " Yuntao Wang
  0 siblings, 1 reply; 6+ messages in thread
From: Andrii Nakryiko @ 2022-04-03 23:10 UTC (permalink / raw)
  To: Yuntao Wang
  Cc: Andrii Nakryiko, Alexei Starovoitov, bpf, Daniel Borkmann,
	john fastabend, Martin Lau, KP Singh, open list, Networking,
	Song Liu, Yonghong Song, Toke Høiland-Jørgensen

On Wed, Mar 16, 2022 at 7:52 AM Yuntao Wang <ytcoode@gmail.com> wrote:
>
> Since core relos is an optional part of the .BTF.ext ELF section, we should
> skip parsing it instead of returning -EINVAL if header size is less than
> offsetofend(struct btf_ext_header, core_relo_len).
>
> Fixes: e9fc3ce99b34 ("libbpf: Streamline error reporting for high-level APIs")
> Signed-off-by: Yuntao Wang <ytcoode@gmail.com>
> ---
> v1 -> v2: skip core relos if hdr_len < offsetofend(core_relo_len)
>

Seems like this never made it to Patchworks. Can you please trim down
the CC list and resubmit?

>  tools/lib/bpf/btf.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c
> index 1383e26c5d1f..9b7196b21498 100644
> --- a/tools/lib/bpf/btf.c
> +++ b/tools/lib/bpf/btf.c
> @@ -2826,10 +2826,8 @@ struct btf_ext *btf_ext__new(const __u8 *data, __u32 size)
>         if (err)
>                 goto done;
>
> -       if (btf_ext->hdr->hdr_len < offsetofend(struct btf_ext_header, core_relo_len)) {
> -               err = -EINVAL;
> -               goto done;
> -       }
> +       if (btf_ext->hdr->hdr_len < offsetofend(struct btf_ext_header, core_relo_len))
> +               goto done; // skip core relos parsing

don't use C++-style comments, only /* */

>
>         err = btf_ext_setup_core_relos(btf_ext);
>         if (err)
> --
> 2.35.1
>

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [PATCH bpf-next v3] libbpf: Don't return -EINVAL if hdr_len < offsetofend(core_relo_len)
  2022-04-03 23:10     ` Andrii Nakryiko
@ 2022-04-04  0:53       ` Yuntao Wang
  2022-04-04  1:30         ` patchwork-bot+netdevbpf
  0 siblings, 1 reply; 6+ messages in thread
From: Yuntao Wang @ 2022-04-04  0:53 UTC (permalink / raw)
  To: andrii.nakryiko
  Cc: andrii, ast, bpf, daniel, john.fastabend, kafai, kpsingh,
	linux-kernel, netdev, songliubraving, toke, yhs, ytcoode

Since core relos is an optional part of the .BTF.ext ELF section, we should
skip parsing it instead of returning -EINVAL if header size is less than
offsetofend(struct btf_ext_header, core_relo_len).

Signed-off-by: Yuntao Wang <ytcoode@gmail.com>
---
v1 -> v2: skip core relos if hdr_len < offsetofend(core_relo_len)
v2 -> v3: fix comment style

 tools/lib/bpf/btf.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c
index 1383e26c5d1f..d124e9e533f0 100644
--- a/tools/lib/bpf/btf.c
+++ b/tools/lib/bpf/btf.c
@@ -2826,10 +2826,8 @@ struct btf_ext *btf_ext__new(const __u8 *data, __u32 size)
 	if (err)
 		goto done;
 
-	if (btf_ext->hdr->hdr_len < offsetofend(struct btf_ext_header, core_relo_len)) {
-		err = -EINVAL;
-		goto done;
-	}
+	if (btf_ext->hdr->hdr_len < offsetofend(struct btf_ext_header, core_relo_len))
+		goto done; /* skip core relos parsing */
 
 	err = btf_ext_setup_core_relos(btf_ext);
 	if (err)
-- 
2.35.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH bpf-next v3] libbpf: Don't return -EINVAL if hdr_len < offsetofend(core_relo_len)
  2022-04-04  0:53       ` [PATCH bpf-next v3] " Yuntao Wang
@ 2022-04-04  1:30         ` patchwork-bot+netdevbpf
  0 siblings, 0 replies; 6+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-04-04  1:30 UTC (permalink / raw)
  To: Yuntao Wang
  Cc: andrii.nakryiko, andrii, ast, bpf, daniel, john.fastabend, kafai,
	kpsingh, linux-kernel, netdev, songliubraving, toke, yhs

Hello:

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

On Mon,  4 Apr 2022 08:53:20 +0800 you wrote:
> Since core relos is an optional part of the .BTF.ext ELF section, we should
> skip parsing it instead of returning -EINVAL if header size is less than
> offsetofend(struct btf_ext_header, core_relo_len).
> 
> Signed-off-by: Yuntao Wang <ytcoode@gmail.com>
> ---
> v1 -> v2: skip core relos if hdr_len < offsetofend(core_relo_len)
> v2 -> v3: fix comment style
> 
> [...]

Here is the summary with links:
  - [bpf-next,v3] libbpf: Don't return -EINVAL if hdr_len < offsetofend(core_relo_len)
    https://git.kernel.org/bpf/bpf-next/c/a6a86da847eb

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



^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-04-04  1:30 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-12 17:13 [PATCH bpf-next] libbpf: Remove redundant check in btf_ext__new() Yuntao Wang
2022-03-15 18:36 ` Andrii Nakryiko
2022-03-16 14:52   ` [PATCH bpf-next v2] libbpf: Don't return -EINVAL if hdr_len < offsetofend(core_relo_len) Yuntao Wang
2022-04-03 23:10     ` Andrii Nakryiko
2022-04-04  0:53       ` [PATCH bpf-next v3] " Yuntao Wang
2022-04-04  1:30         ` patchwork-bot+netdevbpf

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).