mbox series

pull-request: bpf 2020-05-09

Message ID 20200508230527.24382-1-daniel@iogearbox.net
State Accepted
Delegated to: David Miller
Headers show
Series pull-request: bpf 2020-05-09 | expand

Pull-request

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

Message

Daniel Borkmann May 8, 2020, 11:05 p.m. UTC
Hi David,

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

We've added 4 non-merge commits during the last 9 day(s) which contain
a total of 4 files changed, 11 insertions(+), 6 deletions(-).

The main changes are:

1) Fix msg_pop_data() helper incorrectly setting an sge length in some
   cases as well as fixing bpf_tcp_ingress() wrongly accounting bytes
   in sg.size, from John Fastabend.

2) Fix to return an -EFAULT error when copy_to_user() of the value
   fails in map_lookup_and_delete_elem(), from Wei Yongjun.

3) Fix sk_psock refcnt leak in tcp_bpf_recvmsg(), from Xiyu Yang.

Please consider pulling these changes from:

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

Thanks a lot!

Also thanks to reporters, reviewers and testers of commits in this pull-request:

Jakub Sitnicki, Martin KaFai Lau

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

The following changes since commit 37255e7a8f470a7d9678be89c18ba15d6ebf43f7:

  Merge tag 'batadv-net-for-davem-20200427' of git://git.open-mesh.org/linux-merge (2020-04-27 13:02:55 -0700)

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 81aabbb9fb7b4b1efd073b62f0505d3adad442f3:

  bpf, sockmap: bpf_tcp_ingress needs to subtract bytes from sg.size (2020-05-06 00:22:22 +0200)

----------------------------------------------------------------
John Fastabend (2):
      bpf, sockmap: msg_pop_data can incorrecty set an sge length
      bpf, sockmap: bpf_tcp_ingress needs to subtract bytes from sg.size

Wei Yongjun (1):
      bpf: Fix error return code in map_lookup_and_delete_elem()

Xiyu Yang (1):
      bpf: Fix sk_psock refcnt leak when receiving message

 include/linux/skmsg.h |  1 +
 kernel/bpf/syscall.c  |  4 +++-
 net/core/filter.c     |  2 +-
 net/ipv4/tcp_bpf.c    | 10 ++++++----
 4 files changed, 11 insertions(+), 6 deletions(-)

Comments

Jakub Kicinski May 9, 2020, 2:02 a.m. UTC | #1
On Sat,  9 May 2020 01:05:27 +0200 Daniel Borkmann wrote:
> Hi David,
> 
> The following pull-request contains BPF updates for your *net* tree.
> 
> We've added 4 non-merge commits during the last 9 day(s) which contain
> a total of 4 files changed, 11 insertions(+), 6 deletions(-).
> 
> The main changes are:
> 
> 1) Fix msg_pop_data() helper incorrectly setting an sge length in some
>    cases as well as fixing bpf_tcp_ingress() wrongly accounting bytes
>    in sg.size, from John Fastabend.
> 
> 2) Fix to return an -EFAULT error when copy_to_user() of the value
>    fails in map_lookup_and_delete_elem(), from Wei Yongjun.
> 
> 3) Fix sk_psock refcnt leak in tcp_bpf_recvmsg(), from Xiyu Yang.

Pulled, thank you!