mbox series

[0/2] sockmap, fix for some error paths with helpers

Message ID 158861271707.14306.15853815339036099229.stgit@john-Precision-5820-Tower
Headers show
Series sockmap, fix for some error paths with helpers | expand

Message

John Fastabend May 4, 2020, 5:21 p.m. UTC
In these two cases sk_msg layout was getting confused with some helper
sequences.

I found these while cleaning up test_sockmap to do a better job covering
the different scenarios. Those patches will go to bpf-next and include
tests that cover these two cases.

---

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


 include/linux/skmsg.h |    1 +
 net/core/filter.c     |    2 +-
 net/ipv4/tcp_bpf.c    |    1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

--
Signature

Comments

Jakub Sitnicki May 5, 2020, 9:30 a.m. UTC | #1
On Mon, May 04, 2020 at 07:21 PM CEST, John Fastabend wrote:
> In these two cases sk_msg layout was getting confused with some helper
> sequences.
>
> I found these while cleaning up test_sockmap to do a better job covering
> the different scenarios. Those patches will go to bpf-next and include
> tests that cover these two cases.
>
> ---
>
> 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

Both of these LGTM. Looking forward to revamped test_sockmap.

For the series:

Reviewed-by: Jakub Sitnicki <jakub@cloudflare.com>
Daniel Borkmann May 5, 2020, 10:28 p.m. UTC | #2
On 5/4/20 7:21 PM, John Fastabend wrote:
> In these two cases sk_msg layout was getting confused with some helper
> sequences.
> 
> I found these while cleaning up test_sockmap to do a better job covering
> the different scenarios. Those patches will go to bpf-next and include
> tests that cover these two cases.
> 
> ---
> 
> 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
> 
> 
>   include/linux/skmsg.h |    1 +
>   net/core/filter.c     |    2 +-
>   net/ipv4/tcp_bpf.c    |    1 -
>   3 files changed, 2 insertions(+), 2 deletions(-)
> 
> --
> Signature
> 

Applied to bpf, thanks!