2022-09-17 09:10:56

by williamsukatube

Subject: [PATCH -next] bpf: simplify code in btf_parse_hdr

From: William Dean <[email protected]>

It could directly return 'btf_check_sec_info' to simplify code.

Signed-off-by: William Dean <[email protected]>
---
kernel/bpf/btf.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
index 7e64447659f3..80eda86ddfce 100644
--- a/kernel/bpf/btf.c
+++ b/kernel/bpf/btf.c
@@ -4854,7 +4854,6 @@ static int btf_parse_hdr(struct btf_verifier_env *env)
u32 hdr_len, hdr_copy, btf_data_size;
const struct btf_header *hdr;
struct btf *btf;
- int err;

btf = env->btf;
btf_data_size = btf->data_size;
@@ -4911,11 +4910,7 @@ static int btf_parse_hdr(struct btf_verifier_env *env)
return -EINVAL;
}

- err = btf_check_sec_info(env, btf_data_size);
- if (err)
- return err;
-
- return 0;
+ return btf_check_sec_info(env, btf_data_size);
}

static int btf_check_type_tags(struct btf_verifier_env *env,
--
2.25.1

2022-09-20 06:15:20

by Yonghong Song

Subject: Re: [PATCH -next] bpf: simplify code in btf_parse_hdr

On 9/17/22 1:42 AM, [email protected] wrote:
> From: William Dean <[email protected]>
>
> It could directly return 'btf_check_sec_info' to simplify code.
>
> Signed-off-by: William Dean <[email protected]>

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

2022-09-21 18:30:32

by patchwork-bot+netdevbpf

Subject: Re: [PATCH -next] bpf: simplify code in btf_parse_hdr

Hello:

This patch was applied to bpf/bpf-next.git (master)
by Martin KaFai Lau <[email protected]>:

On Sat, 17 Sep 2022 16:42:48 +0800 you wrote:
> From: William Dean <[email protected]>
>
> It could directly return 'btf_check_sec_info' to simplify code.
>
> Signed-off-by: William Dean <[email protected]>
> ---
> kernel/bpf/btf.c | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
> [...]

Here is the summary with links:
- [-next] bpf: simplify code in btf_parse_hdr
https://git.kernel.org/bpf/bpf-next/c/3a74904ceff3

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