Commit 75da63b7 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf 

Alexei Starovoitov says:

====================
bpf 2021-08-26

We've added 1 non-merge commit during the last 1 day(s):

1) Fix ringbuf helper function compatibility, from Daniel.

* https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf:
  bpf: Fix ringbuf helper function compatibility
====================

Link: https://lore.kernel.org/r/20210826153720.19083-1-alexei.starovoitov@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 57f81782 5b029a32

kernel/bpf/verifier.c

+6 −2
Original line number Diff line number Diff line
@@ -5150,8 +5150,6 @@ static int check_map_func_compatibility(struct bpf_verifier_env *env, 
	case BPF_MAP_TYPE_RINGBUF:

		if (func_id != BPF_FUNC_ringbuf_output &&

		    func_id != BPF_FUNC_ringbuf_reserve &&

		    func_id != BPF_FUNC_ringbuf_submit &&

		    func_id != BPF_FUNC_ringbuf_discard &&

		    func_id != BPF_FUNC_ringbuf_query)

			goto error;

		break;
@@ -5260,6 +5258,12 @@ static int check_map_func_compatibility(struct bpf_verifier_env *env, 
		if (map->map_type != BPF_MAP_TYPE_PERF_EVENT_ARRAY)

			goto error;

		break;

	case BPF_FUNC_ringbuf_output:

	case BPF_FUNC_ringbuf_reserve:

	case BPF_FUNC_ringbuf_query:

		if (map->map_type != BPF_MAP_TYPE_RINGBUF)

			goto error;

		break;

	case BPF_FUNC_get_stackid:

		if (map->map_type != BPF_MAP_TYPE_STACK_TRACE)

			goto error;