]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
authorJakub Kicinski <kuba@kernel.org>
Sat, 9 May 2020 01:58:39 +0000 (18:58 -0700)
committerJakub Kicinski <kuba@kernel.org>
Sat, 9 May 2020 01:58:39 +0000 (18:58 -0700)
commitecf4c6e21f66e203e09a3b265376e704c30acf77
tree53407f0b097cda0e2851cfc93ec0893b4d796cab
parent770308a22ce75fef5fe6d1c063ab17e71563e7a6
parentb0a6dd99e24a9cc1a876ba6fff5191c7995979b1
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf

Daniel Borkmann says:

====================
pull-request: bpf 2020-05-09

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.
====================

Signed-off-by: Jakub Kicinski <kuba@kernel.org>