bpf: Do not try bpf_msg_push_data with len 0

If bpf_msg_push_data() is called with len 0 (as it happens during
selftests/bpf/test_sockmap), we do not need to do anything and can
return early.

Calling bpf_msg_push_data() with len 0 previously lead to a wrong ENOMEM
error: we later called get_order(copy + len); if len was 0, copy + len
was also often 0 and get_order() returned some undefined value (at the
moment 52). alloc_pages() caught that and failed, but then bpf_msg_push_data()
returned ENOMEM. This was wrong because we are most probably not out of
memory and actually do not need any additional memory.

Fixes: 6fff607e2f ("bpf: sk_msg program helper bpf_msg_push_data")
Signed-off-by: Felix Maurer <fmaurer@redhat.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Yonghong Song <yhs@fb.com>
Acked-by: John Fastabend <john.fastabend@gmail.com>
Link: https://lore.kernel.org/bpf/df69012695c7094ccb1943ca02b4920db3537466.1644421921.git.fmaurer@redhat.com

This commit is contained in:

Felix Maurer

2022-02-09 16:55:26 +01:00

committed by

Daniel Borkmann

parent 525de9a793

commit 4a11678f68

1 changed files with 3 additions and 0 deletions

									
										3

net/core/filter.c

										View File
									
				@ -2710,6 +2710,9 @@ BPF_CALL_4(bpf_msg_push_data, struct sk_msg *, msg, u32, start,

					if (unlikely(flags))

						return -EINVAL;

					if (unlikely(len == 0))

						return 0;

					/* First find the starting scatterlist element */

					i = msg->sg.start;

					do {

bpf: Do not try bpf_msg_push_data with len 0

3 net/core/filter.c Unescape Escape View File

3

net/core/filter.c

View File