From 59c019fdd11a555bcd520e43b14bd4680c929e57 Mon Sep 17 00:00:00 2001 From: Sami Tolvanen Date: Wed, 4 Sep 2019 12:38:57 -0700 Subject: [PATCH] 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 Acked-by: Yonghong Song Signed-off-by: Alexei Starovoitov --- net/kcm/kcmsock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/kcm/kcmsock.c b/net/kcm/kcmsock.c index b919db02c7f9..8cc0e5a3b467 100644 --- a/net/kcm/kcmsock.c +++ b/net/kcm/kcmsock.c @@ -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)