Squash to "selftests/bpf: Add bpf_first scheduler & test" 2

[PATCH mptcp-next] Squash to "selftests/bpf: Add bpf_first scheduler & test" 2

Posted by Geliang Tang 2 weeks, 3 days ago

From: Geliang Tang <tanggeliang@kylinos.cn>

Check the string length of sched as Mat suggested.

Please insert this patch into "refactor mptcp bpf tests" v9 as the
last commit.

Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
 tools/testing/selftests/bpf/prog_tests/mptcp.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c
index 9f17453b2d59..56dca35f289d 100644
--- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
+++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
@@ -509,6 +509,10 @@ static void test_bpf_sched(struct bpf_object *obj, char *sched,
 	struct bpf_link *link;
 	struct bpf_map *map;
 
+	if (!ASSERT_LT(strlen(bpf_sched) + strlen(sched),
+		       MPTCP_SCHED_NAME_MAX, "too long string"))
+		return;
+
 	map = bpf_object__find_map_by_name(obj, sched);
 	link = bpf_map__attach_struct_ops(map);
 	if (CHECK(!link, sched, "attach_struct_ops: %d\n", errno))
-- 
2.40.1

Re: [PATCH mptcp-next] Squash to "selftests/bpf: Add bpf_first scheduler & test" 2

Posted by Mat Martineau 2 weeks, 2 days ago

On Thu, 18 Apr 2024, Geliang Tang wrote:

> From: Geliang Tang <tanggeliang@kylinos.cn>
>
> Check the string length of sched as Mat suggested.
>
> Please insert this patch into "refactor mptcp bpf tests" v9 as the
> last commit.
>
> Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
> ---
> tools/testing/selftests/bpf/prog_tests/mptcp.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c
> index 9f17453b2d59..56dca35f289d 100644
> --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
> +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
> @@ -509,6 +509,10 @@ static void test_bpf_sched(struct bpf_object *obj, char *sched,
> 	struct bpf_link *link;
> 	struct bpf_map *map;
>
> +	if (!ASSERT_LT(strlen(bpf_sched) + strlen(sched),
> +		       MPTCP_SCHED_NAME_MAX, "too long string"))

Matthieu, could you change the above message to "Scheduler name too long" 
when applying?

Otherwise, looks good to squash with along with v9 of "refactor mptcp bpf 
tests", thank you!

- Mat



> +		return;
> +
> 	map = bpf_object__find_map_by_name(obj, sched);
> 	link = bpf_map__attach_struct_ops(map);
> 	if (CHECK(!link, sched, "attach_struct_ops: %d\n", errno))
> -- 
> 2.40.1
>
>
>