diff mbox series

[bpf] selftests/bpf: Fix freplace_link segfault in tailcalls prog test

Message ID 20250121125602.683613-1-wutengda@huaweicloud.com (mailing list archive)
State Superseded
Delegated to: BPF
Headers show
Series [bpf] selftests/bpf: Fix freplace_link segfault in tailcalls prog test | expand

Checks

Context Check Description
bpf/vmtest-bpf-PR success PR summary
bpf/vmtest-bpf-VM_Test-1 success Logs for ShellCheck
bpf/vmtest-bpf-VM_Test-0 success Logs for Lint
bpf/vmtest-bpf-VM_Test-2 success Logs for Unittests
bpf/vmtest-bpf-VM_Test-3 success Logs for Validate matrix.py
bpf/vmtest-bpf-VM_Test-5 success Logs for aarch64-gcc / build-release
bpf/vmtest-bpf-VM_Test-4 success Logs for aarch64-gcc / build / build for aarch64 with gcc
bpf/vmtest-bpf-VM_Test-6 success Logs for aarch64-gcc / test (test_maps, false, 360) / test_maps on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-10 success Logs for aarch64-gcc / veristat-kernel
bpf/vmtest-bpf-VM_Test-9 success Logs for aarch64-gcc / test (test_verifier, false, 360) / test_verifier on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-12 success Logs for s390x-gcc / build / build for s390x with gcc
bpf/vmtest-bpf-VM_Test-16 success Logs for s390x-gcc / test (test_verifier, false, 360) / test_verifier on s390x with gcc
bpf/vmtest-bpf-VM_Test-13 success Logs for s390x-gcc / build-release
bpf/vmtest-bpf-VM_Test-11 success Logs for aarch64-gcc / veristat-meta
bpf/vmtest-bpf-VM_Test-17 success Logs for s390x-gcc / veristat-kernel
bpf/vmtest-bpf-VM_Test-21 success Logs for x86_64-gcc / build-release
bpf/vmtest-bpf-VM_Test-19 success Logs for set-matrix
bpf/vmtest-bpf-VM_Test-18 success Logs for s390x-gcc / veristat-meta
bpf/vmtest-bpf-VM_Test-20 success Logs for x86_64-gcc / build / build for x86_64 with gcc
bpf/vmtest-bpf-VM_Test-27 success Logs for x86_64-gcc / test (test_verifier, false, 360) / test_verifier on x86_64 with gcc
netdev/series_format success Single patches do not need cover letters
netdev/tree_selection success Clearly marked for bpf
netdev/ynl success Generated files up to date; no warnings/errors; no diff in generated;
netdev/fixes_present success Fixes tag present in non-next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 0 this patch: 0
netdev/build_tools success Errors and warnings before: 0 (+0) this patch: 0 (+0)
netdev/cc_maintainers warning 3 maintainers not CCed: mykolal@fb.com shuah@kernel.org linux-kselftest@vger.kernel.org
netdev/build_clang success Errors and warnings before: 0 this patch: 0
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success Fixes tag looks correct
netdev/build_allmodconfig_warn success Errors and warnings before: 0 this patch: 0
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 22 lines checked
netdev/build_clang_rust success No Rust files in patch. Skipping build
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0
bpf/vmtest-bpf-VM_Test-8 success Logs for aarch64-gcc / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-7 success Logs for aarch64-gcc / test (test_progs, false, 360) / test_progs on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-14 success Logs for s390x-gcc / test (test_progs, false, 360) / test_progs on s390x with gcc
bpf/vmtest-bpf-VM_Test-15 success Logs for s390x-gcc / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on s390x with gcc
bpf/vmtest-bpf-VM_Test-23 success Logs for x86_64-gcc / test (test_progs, false, 360) / test_progs on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-22 success Logs for x86_64-gcc / test (test_maps, false, 360) / test_maps on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-25 success Logs for x86_64-gcc / test (test_progs_no_alu32_parallel, true, 30) / test_progs_no_alu32_parallel on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-24 success Logs for x86_64-gcc / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-26 success Logs for x86_64-gcc / test (test_progs_parallel, true, 30) / test_progs_parallel on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-28 success Logs for x86_64-gcc / veristat-kernel / x86_64-gcc veristat_kernel
bpf/vmtest-bpf-VM_Test-29 success Logs for x86_64-gcc / veristat-meta / x86_64-gcc veristat_meta
bpf/vmtest-bpf-VM_Test-31 success Logs for x86_64-llvm-17 / build-release / build for x86_64 with llvm-17-O2
bpf/vmtest-bpf-VM_Test-30 success Logs for x86_64-llvm-17 / build / build for x86_64 with llvm-17
bpf/vmtest-bpf-VM_Test-32 success Logs for x86_64-llvm-17 / test (test_maps, false, 360) / test_maps on x86_64 with llvm-17
bpf/vmtest-bpf-VM_Test-36 success Logs for x86_64-llvm-17 / veristat-kernel
bpf/vmtest-bpf-VM_Test-38 success Logs for x86_64-llvm-18 / build / build for x86_64 with llvm-18
bpf/vmtest-bpf-VM_Test-37 success Logs for x86_64-llvm-17 / veristat-meta
bpf/vmtest-bpf-VM_Test-39 success Logs for x86_64-llvm-18 / build-release / build for x86_64 with llvm-18-O2
bpf/vmtest-bpf-VM_Test-40 success Logs for x86_64-llvm-18 / test (test_maps, false, 360) / test_maps on x86_64 with llvm-18
bpf/vmtest-bpf-VM_Test-44 success Logs for x86_64-llvm-18 / test (test_verifier, false, 360) / test_verifier on x86_64 with llvm-18
bpf/vmtest-bpf-VM_Test-45 success Logs for x86_64-llvm-18 / veristat-kernel
bpf/vmtest-bpf-VM_Test-35 success Logs for x86_64-llvm-17 / test (test_verifier, false, 360) / test_verifier on x86_64 with llvm-17
bpf/vmtest-bpf-VM_Test-46 success Logs for x86_64-llvm-18 / veristat-meta
bpf/vmtest-bpf-VM_Test-33 success Logs for x86_64-llvm-17 / test (test_progs, false, 360) / test_progs on x86_64 with llvm-17
bpf/vmtest-bpf-VM_Test-34 success Logs for x86_64-llvm-17 / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with llvm-17
bpf/vmtest-bpf-VM_Test-41 success Logs for x86_64-llvm-18 / test (test_progs, false, 360) / test_progs on x86_64 with llvm-18
bpf/vmtest-bpf-VM_Test-43 success Logs for x86_64-llvm-18 / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with llvm-18
bpf/vmtest-bpf-VM_Test-42 success Logs for x86_64-llvm-18 / test (test_progs_cpuv4, false, 360) / test_progs_cpuv4 on x86_64 with llvm-18

Commit Message

Tengda Wu Jan. 21, 2025, 12:56 p.m. UTC 
There are two bpf_link__destroy(freplace_link) calls in
test_tailcall_bpf2bpf_freplace(). After the first bpf_link__destroy()
is called, if the following bpf_map_{update,delete}_elem() throws an
exception, it will jump to the "out" label and call bpf_link__destroy()
again, causing double free and eventually leading to a segfault.

Fix this issue by moving bpf_link__destroy() out of the "out" label
and only calling it when freplace_link exists and has not been freed.

Fixes: 021611d33e78 ("selftests/bpf: Add test to verify tailcall and freplace restrictions")
Signed-off-by: Tengda Wu <wutengda@huaweicloud.com>
---
 tools/testing/selftests/bpf/prog_tests/tailcalls.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Leon Hwang Jan. 21, 2025, 2:27 p.m. UTC | #1 
Hi Tengda,

On 2025/1/21 20:56, Tengda Wu wrote:
> There are two bpf_link__destroy(freplace_link) calls in
> test_tailcall_bpf2bpf_freplace(). After the first bpf_link__destroy()
> is called, if the following bpf_map_{update,delete}_elem() throws an
> exception, it will jump to the "out" label and call bpf_link__destroy()
> again, causing double free and eventually leading to a segfault.
> 

Thank you for pointing this out.

> Fix this issue by moving bpf_link__destroy() out of the "out" label
> and only calling it when freplace_link exists and has not been freed.
> 

I think it would be better to reset freplace_link to NULL immediately
after the first bpf_link__destroy(freplace_link) call. This would help
avoid potential double-free scenarios.

I’ve tested the following diff, which implements this change:

diff --git a/tools/testing/selftests/bpf/prog_tests/tailcalls.c
b/tools/testing/selftests/bpf/prog_tests/tailcalls.c
index 544144620ca61..a12fa0521ccc0 100644
--- a/tools/testing/selftests/bpf/prog_tests/tailcalls.c
+++ b/tools/testing/selftests/bpf/prog_tests/tailcalls.c
@@ -1602,6 +1602,7 @@ static void test_tailcall_bpf2bpf_freplace(void)
        err = bpf_link__destroy(freplace_link);
        if (!ASSERT_OK(err, "destroy link"))
                goto out;
+       freplace_link = NULL;

        /* OK to update prog_array map then delete element from the map. */

Thanks,
Leon

> Fixes: 021611d33e78 ("selftests/bpf: Add test to verify tailcall and freplace restrictions")
> Signed-off-by: Tengda Wu <wutengda@huaweicloud.com>
> ---
>  tools/testing/selftests/bpf/prog_tests/tailcalls.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/tools/testing/selftests/bpf/prog_tests/tailcalls.c b/tools/testing/selftests/bpf/prog_tests/tailcalls.c
> index 544144620ca6..028439dd2c5f 100644
> --- a/tools/testing/selftests/bpf/prog_tests/tailcalls.c
> +++ b/tools/testing/selftests/bpf/prog_tests/tailcalls.c
> @@ -1624,7 +1624,7 @@ static void test_tailcall_bpf2bpf_freplace(void)
>  	freplace_link = bpf_program__attach_freplace(freplace_skel->progs.entry_freplace,
>  						     prog_fd, "subprog_tc");
>  	if (!ASSERT_ERR_PTR(freplace_link, "attach_freplace failure"))
> -		goto out;
> +		goto out_free_link;
>  
>  	err = bpf_map_delete_elem(map_fd, &key);
>  	if (!ASSERT_OK(err, "delete_elem from jmp_table"))
> @@ -1638,11 +1638,11 @@ static void test_tailcall_bpf2bpf_freplace(void)
>  		goto out;
>  
>  	err = bpf_map_update_elem(map_fd, &key, &prog_fd, BPF_ANY);
> -	if (!ASSERT_ERR(err, "update jmp_table failure"))
> -		goto out;
> +	ASSERT_ERR(err, "update jmp_table failure");
>  
> -out:
> +out_free_link:
>  	bpf_link__destroy(freplace_link);
> +out:
>  	tailcall_freplace__destroy(freplace_skel);
>  	tc_bpf2bpf__destroy(tc_skel);
>  }
Tengda Wu Jan. 22, 2025, 12:59 a.m. UTC | #2 
Hi Leon,

On 2025/1/21 22:27, Leon Hwang wrote:
> Hi Tengda,
> 
> On 2025/1/21 20:56, Tengda Wu wrote:
>> There are two bpf_link__destroy(freplace_link) calls in
>> test_tailcall_bpf2bpf_freplace(). After the first bpf_link__destroy()
>> is called, if the following bpf_map_{update,delete}_elem() throws an
>> exception, it will jump to the "out" label and call bpf_link__destroy()
>> again, causing double free and eventually leading to a segfault.
>>
> 
> Thank you for pointing this out.
> 
>> Fix this issue by moving bpf_link__destroy() out of the "out" label
>> and only calling it when freplace_link exists and has not been freed.
>>
> 
> I think it would be better to reset freplace_link to NULL immediately
> after the first bpf_link__destroy(freplace_link) call. This would help
> avoid potential double-free scenarios.

What a great suggestion, I can't believe I didn't think of it! Haha.
I will resend a v2 version later. Thanks, Leon.

> 
> I’ve tested the following diff, which implements this change:
> 
> diff --git a/tools/testing/selftests/bpf/prog_tests/tailcalls.c
> b/tools/testing/selftests/bpf/prog_tests/tailcalls.c
> index 544144620ca61..a12fa0521ccc0 100644
> --- a/tools/testing/selftests/bpf/prog_tests/tailcalls.c
> +++ b/tools/testing/selftests/bpf/prog_tests/tailcalls.c
> @@ -1602,6 +1602,7 @@ static void test_tailcall_bpf2bpf_freplace(void)
>         err = bpf_link__destroy(freplace_link);
>         if (!ASSERT_OK(err, "destroy link"))
>                 goto out;
> +       freplace_link = NULL;
> 
>         /* OK to update prog_array map then delete element from the map. */
> 
> Thanks,
> Leon
> 
>> Fixes: 021611d33e78 ("selftests/bpf: Add test to verify tailcall and freplace restrictions")
>> Signed-off-by: Tengda Wu <wutengda@huaweicloud.com>
>> ---
>>  tools/testing/selftests/bpf/prog_tests/tailcalls.c | 8 ++++----
>>  1 file changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/tools/testing/selftests/bpf/prog_tests/tailcalls.c b/tools/testing/selftests/bpf/prog_tests/tailcalls.c
>> index 544144620ca6..028439dd2c5f 100644
>> --- a/tools/testing/selftests/bpf/prog_tests/tailcalls.c
>> +++ b/tools/testing/selftests/bpf/prog_tests/tailcalls.c
>> @@ -1624,7 +1624,7 @@ static void test_tailcall_bpf2bpf_freplace(void)
>>  	freplace_link = bpf_program__attach_freplace(freplace_skel->progs.entry_freplace,
>>  						     prog_fd, "subprog_tc");
>>  	if (!ASSERT_ERR_PTR(freplace_link, "attach_freplace failure"))
>> -		goto out;
>> +		goto out_free_link;
>>  
>>  	err = bpf_map_delete_elem(map_fd, &key);
>>  	if (!ASSERT_OK(err, "delete_elem from jmp_table"))
>> @@ -1638,11 +1638,11 @@ static void test_tailcall_bpf2bpf_freplace(void)
>>  		goto out;
>>  
>>  	err = bpf_map_update_elem(map_fd, &key, &prog_fd, BPF_ANY);
>> -	if (!ASSERT_ERR(err, "update jmp_table failure"))
>> -		goto out;
>> +	ASSERT_ERR(err, "update jmp_table failure");
>>  
>> -out:
>> +out_free_link:
>>  	bpf_link__destroy(freplace_link);
>> +out:
>>  	tailcall_freplace__destroy(freplace_skel);
>>  	tc_bpf2bpf__destroy(tc_skel);
>>  }
>
diff mbox series

Patch

diff --git a/tools/testing/selftests/bpf/prog_tests/tailcalls.c b/tools/testing/selftests/bpf/prog_tests/tailcalls.c
index 544144620ca6..028439dd2c5f 100644
--- a/tools/testing/selftests/bpf/prog_tests/tailcalls.c
+++ b/tools/testing/selftests/bpf/prog_tests/tailcalls.c
@@ -1624,7 +1624,7 @@  static void test_tailcall_bpf2bpf_freplace(void)
 	freplace_link = bpf_program__attach_freplace(freplace_skel->progs.entry_freplace,
 						     prog_fd, "subprog_tc");
 	if (!ASSERT_ERR_PTR(freplace_link, "attach_freplace failure"))
-		goto out;
+		goto out_free_link;
 
 	err = bpf_map_delete_elem(map_fd, &key);
 	if (!ASSERT_OK(err, "delete_elem from jmp_table"))
@@ -1638,11 +1638,11 @@  static void test_tailcall_bpf2bpf_freplace(void)
 		goto out;
 
 	err = bpf_map_update_elem(map_fd, &key, &prog_fd, BPF_ANY);
-	if (!ASSERT_ERR(err, "update jmp_table failure"))
-		goto out;
+	ASSERT_ERR(err, "update jmp_table failure");
 
-out:
+out_free_link:
 	bpf_link__destroy(freplace_link);
+out:
 	tailcall_freplace__destroy(freplace_skel);
 	tc_bpf2bpf__destroy(tc_skel);
 }