diff mbox series

selftests/bpf: Fix incorrect parameters in NULL pointer checking

Message ID 20240820023622.29190-1-hao.ge@linux.dev (mailing list archive)
State Accepted
Commit c264487e5410e5a72db8a414566ab7d144223e6c
Headers show
Series selftests/bpf: Fix incorrect parameters in NULL pointer checking | expand

Commit Message

Hao Ge Aug. 20, 2024, 2:36 a.m. UTC
From: Hao Ge <gehao@kylinos.cn>

Smatch reported the following warning:
    ./tools/testing/selftests/bpf/testing_helpers.c:455 get_xlated_program()
    warn: variable dereferenced before check 'buf' (see line 454)

It seems correct,so let's modify it based on it's suggestion.

Actually,commit b23ed4d74c4d ("selftests/bpf: Fix invalid pointer
check in get_xlated_program()") fixed an issue in the test_verifier.c
once,but it was reverted this time.

Let's solve this issue with the minimal changes possible.

Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Closes: https://lore.kernel.org/all/1eb3732f-605a-479d-ba64-cd14250cbf91@stanley.mountain/
Fixes: b4b7a4099b8c ("selftests/bpf: Factor out get_xlated_program() helper")
Signed-off-by: Hao Ge <gehao@kylinos.cn>
---
 tools/testing/selftests/bpf/testing_helpers.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Hao Ge Aug. 20, 2024, 2:47 a.m. UTC | #1
Hi

I apologize for the confusion.

  I mistakenly thought that my previous email 
(https://lore.kernel.org/all/20240820023447.29002-1-hao.ge@linux.dev/)

didn't send due to network issues on my computer, so I resent it.

However, it seems that was not the case.

Please kindly disregard this patch as it is identical to the previous one.

I sincerely apologize for wasting everyone's time

On 8/20/24 10:36, Hao Ge wrote:
> From: Hao Ge <gehao@kylinos.cn>
>
> Smatch reported the following warning:
>      ./tools/testing/selftests/bpf/testing_helpers.c:455 get_xlated_program()
>      warn: variable dereferenced before check 'buf' (see line 454)
>
> It seems correct,so let's modify it based on it's suggestion.
>
> Actually,commit b23ed4d74c4d ("selftests/bpf: Fix invalid pointer
> check in get_xlated_program()") fixed an issue in the test_verifier.c
> once,but it was reverted this time.
>
> Let's solve this issue with the minimal changes possible.
>
> Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
> Closes: https://lore.kernel.org/all/1eb3732f-605a-479d-ba64-cd14250cbf91@stanley.mountain/
> Fixes: b4b7a4099b8c ("selftests/bpf: Factor out get_xlated_program() helper")
> Signed-off-by: Hao Ge <gehao@kylinos.cn>
> ---
>   tools/testing/selftests/bpf/testing_helpers.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/testing/selftests/bpf/testing_helpers.c b/tools/testing/selftests/bpf/testing_helpers.c
> index d5379a0e6da8..34dfea295c8e 100644
> --- a/tools/testing/selftests/bpf/testing_helpers.c
> +++ b/tools/testing/selftests/bpf/testing_helpers.c
> @@ -451,7 +451,7 @@ int get_xlated_program(int fd_prog, struct bpf_insn **buf, __u32 *cnt)
>   
>   	*cnt = xlated_prog_len / buf_element_size;
>   	*buf = calloc(*cnt, buf_element_size);
> -	if (!buf) {
> +	if (!*buf) {
>   		perror("can't allocate xlated program buffer");
>   		return -ENOMEM;
>   	}
Thanks

Best regards

Hao
patchwork-bot+netdevbpf@kernel.org Aug. 28, 2024, 4 p.m. UTC | #2
Hello:

This patch was applied to bpf/bpf-next.git (master)
by Alexei Starovoitov <ast@kernel.org>:

On Tue, 20 Aug 2024 10:36:22 +0800 you wrote:
> From: Hao Ge <gehao@kylinos.cn>
> 
> Smatch reported the following warning:
>     ./tools/testing/selftests/bpf/testing_helpers.c:455 get_xlated_program()
>     warn: variable dereferenced before check 'buf' (see line 454)
> 
> It seems correct,so let's modify it based on it's suggestion.
> 
> [...]

Here is the summary with links:
  - selftests/bpf: Fix incorrect parameters in NULL pointer checking
    https://git.kernel.org/bpf/bpf-next/c/c264487e5410

You are awesome, thank you!
diff mbox series

Patch

diff --git a/tools/testing/selftests/bpf/testing_helpers.c b/tools/testing/selftests/bpf/testing_helpers.c
index d5379a0e6da8..34dfea295c8e 100644
--- a/tools/testing/selftests/bpf/testing_helpers.c
+++ b/tools/testing/selftests/bpf/testing_helpers.c
@@ -451,7 +451,7 @@  int get_xlated_program(int fd_prog, struct bpf_insn **buf, __u32 *cnt)
 
 	*cnt = xlated_prog_len / buf_element_size;
 	*buf = calloc(*cnt, buf_element_size);
-	if (!buf) {
+	if (!*buf) {
 		perror("can't allocate xlated program buffer");
 		return -ENOMEM;
 	}