diff options
| author | David S. Miller <davem@davemloft.net> | 2019-09-16 16:02:03 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-09-16 16:02:03 +0200 |
| commit | 28f2c362dbe2a9ec3dfb086dcabbd08ecfcbe236 (patch) | |
| tree | 5e03aa1941369faeeb7919bbfb47ee66de14a8d9 /net | |
| parent | 5f109d45a4768a4bf8b5d6a8f305039bcd4f3e87 (diff) | |
| parent | d895a0f16fadb26d22ab531c49768f7642ae5c3e (diff) | |
| download | linux-stable-28f2c362dbe2a9ec3dfb086dcabbd08ecfcbe236.tar.gz linux-stable-28f2c362dbe2a9ec3dfb086dcabbd08ecfcbe236.tar.bz2 linux-stable-28f2c362dbe2a9ec3dfb086dcabbd08ecfcbe236.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
Daniel Borkmann says:
====================
pull-request: bpf-next 2019-09-16
The following pull-request contains BPF updates for your *net-next* tree.
The main changes are:
1) Now that initial BPF backend for gcc has been merged upstream, enable
BPF kselftest suite for bpf-gcc. Also fix a BE issue with access to
bpf_sysctl.file_pos, from Ilya.
2) Follow-up fix for link-vmlinux.sh to remove bash-specific extensions
related to recent work on exposing BTF info through sysfs, from Andrii.
3) AF_XDP zero copy fixes for i40e and ixgbe driver which caused umem
headroom to be added twice, from Ciara.
4) Refactoring work to convert sock opt tests into test_progs framework
in BPF kselftests, from Stanislav.
5) Fix a general protection fault in dev_map_hash_update_elem(), from Toke.
6) Cleanup to use BPF_PROG_RUN() macro in KCM, from Sami.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/kcm/kcmsock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/kcm/kcmsock.c b/net/kcm/kcmsock.c index 4ff75c3a8d6e..8f12f5c6ab87 100644 --- a/net/kcm/kcmsock.c +++ b/net/kcm/kcmsock.c @@ -379,7 +379,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) |