Commit ccddca0e authored Sep 04, 2019 by Sami Tolvanen Committed by Maciej Żenczykowski Oct 08, 2019

UPSTREAM: kcm: use BPF_PROG_RUN



Instead of invoking struct bpf_prog::bpf_func directly, use the
BPF_PROG_RUN macro.

Bug: 140377409
Change-Id: I26abeccc8d25af0f412935ed97aebb5c64f52a2a
(cherry picked from commit a2c11b034142 ("kcm: use BPF_PROG_RUN"))
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
Acked-by: Yonghong Song <yhs@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
(cherry picked from commit 59c019fd)

parent d9e388f8

net/kcm/kcmsock.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -382,7 +382,7 @@ static int kcm_parse_func_strparser(struct strparser strp, struct sk_buff skb)
		struct kcm_psock *psock = container_of(strp, struct kcm_psock, strp);
		struct bpf_prog *prog = psock->bpf_prog;

		return (*prog->bpf_func)(skb, prog->insnsi);
		return BPF_PROG_RUN(prog, skb);
		}

		static int kcm_read_sock_done(struct strparser *strp, int err)