diff options
| author | John Fastabend <john.fastabend@gmail.com> | 2018-10-16 20:08:04 +0200 |
|---|---|---|
| committer | Daniel Borkmann <daniel@iogearbox.net> | 2018-10-17 02:30:32 +0200 |
| commit | 02c558b2d5d679fbbcaa5b9689484c7e0f8abb7b (patch) | |
| tree | b89b9cb06c6adb6862759afaefae6fb7ab6d768c /net/tls | |
| parent | bpf: skmsg, improve sk_msg_used_element to work in cork context (diff) | |
| download | linux-02c558b2d5d679fbbcaa5b9689484c7e0f8abb7b.tar.xz linux-02c558b2d5d679fbbcaa5b9689484c7e0f8abb7b.zip | |
bpf: sockmap, support for msg_peek in sk_msg with redirect ingress
This adds support for the MSG_PEEK flag when doing redirect to ingress
and receiving on the sk_msg psock queue. Previously the flag was
being ignored which could confuse applications if they expected the
flag to work as normal.
Signed-off-by: John Fastabend <john.fastabend@gmail.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to 'net/tls')
| -rw-r--r-- | net/tls/tls_sw.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c index a525fc4c2a4b..5cd88ba8acd1 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -1478,7 +1478,8 @@ int tls_sw_recvmsg(struct sock *sk, skb = tls_wait_data(sk, psock, flags, timeo, &err); if (!skb) { if (psock) { - int ret = __tcp_bpf_recvmsg(sk, psock, msg, len); + int ret = __tcp_bpf_recvmsg(sk, psock, + msg, len, flags); if (ret > 0) { copied += ret; |