selftests/bpf: Check length of recv in test_sockmap

BugLink: https://bugs.launchpad.net/bugs/2083196

[ Upstream commit de1b5ea789dc28066cc8dc634b6825bd6148f38b ]

The value of recv in msg_loop may be negative, like EWOULDBLOCK, so it's
necessary to check if it is positive before accumulating it to bytes_recvd.

Fixes: 16962b2404 ("bpf: sockmap, add selftests")
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Tested-by: Jakub Sitnicki <jakub@cloudflare.com>
Acked-by: John Fastabend <john.fastabend@gmail.com>
Link: https://lore.kernel.org/bpf/5172563f7c7b2a2e953cef02e89fc34664a7b190.1716446893.git.tanggeliang@kylinos.cn
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Portia Stephens <portia.stephens@canonical.com>
Signed-off-by: Roxana Nicolescu <roxana.nicolescu@canonical.com>

This commit is contained in:

Geliang Tang

2024-05-23 14:50:03 +08:00

committed by

Mehmet Basaran

parent 6b4f28054f

commit d95fc03c91

1 changed files with 2 additions and 1 deletions

									
										tools/testing/selftests/bpf/test_sockmap.c
									
		+2
		-1
	
												View File
												
				@@ -680,7 +680,8 @@ static int msg_loop(int fd, int iov_count, int iov_length, int cnt,

								}

							}

							s->bytes_recvd += recv;

							if (recv > 0)

								s->bytes_recvd += recv;

							if (opt->check_recved_len && s->bytes_recvd > total_bytes) {

								errno = EMSGSIZE;