mbox series

pull-request: bpf 2018-05-14

Message ID 20180514004710.14377-1-daniel@iogearbox.net
State Accepted, archived
Delegated to: David Miller
Headers show
Series pull-request: bpf 2018-05-14 | expand

Pull-request

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

Message

Daniel Borkmann May 14, 2018, 12:47 a.m. UTC
Hi David,

The following pull-request contains BPF updates for your *net* tree.

The main changes are:

1) Fix nfp to allow zero-length BPF capabilities, meaning the nfp
   capability parsing loop will otherwise exit early if the last
   capability is zero length and therefore driver will fail to probe
   with an error such as:

     nfp: BPF capabilities left after parsing, parsed:92 total length:100
     nfp: invalid BPF capabilities at offset:92

   Fix from Jakub.

2) libbpf's bpf_object__open() may return IS_ERR_OR_NULL() and not
   just an error. Fix libbpf's bpf_prog_load_xattr() to handle that
   case as well, also from Jakub.

Please consider pulling these changes from:

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

Thanks a lot!

----------------------------------------------------------------

The following changes since commit 3148dedfe79e422f448a10250d3e2cdf8b7ee617:

  r8169: fix powering up RTL8168h (2018-05-08 22:54:18 -0400)

are available in the git repository at:

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

for you to fetch changes up to 3597683c9da602b0440c5f742d64fa5da79cc026:

  tools: bpf: handle NULL return in bpf_prog_load_xattr() (2018-05-11 00:20:53 +0200)

----------------------------------------------------------------
Jakub Kicinski (2):
      nfp: bpf: allow zero-length capabilities
      tools: bpf: handle NULL return in bpf_prog_load_xattr()

 drivers/net/ethernet/netronome/nfp/bpf/main.c | 2 +-
 tools/lib/bpf/libbpf.c                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

David Miller May 14, 2018, 1:07 a.m. UTC | #1
From: Daniel Borkmann <daniel@iogearbox.net>
Date: Mon, 14 May 2018 02:47:10 +0200

> The following pull-request contains BPF updates for your *net* tree.
> 
> The main changes are:
> 
> 1) Fix nfp to allow zero-length BPF capabilities, meaning the nfp
>    capability parsing loop will otherwise exit early if the last
>    capability is zero length and therefore driver will fail to probe
>    with an error such as:
> 
>      nfp: BPF capabilities left after parsing, parsed:92 total length:100
>      nfp: invalid BPF capabilities at offset:92
> 
>    Fix from Jakub.
> 
> 2) libbpf's bpf_object__open() may return IS_ERR_OR_NULL() and not
>    just an error. Fix libbpf's bpf_prog_load_xattr() to handle that
>    case as well, also from Jakub.
> 
> Please consider pulling these changes from:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git

Pulled, thanks Daniel.