Commit cabede8b authored May 13, 2019 by John Fastabend Committed by Daniel Borkmann May 14, 2019

bpf: sockmap fix msg->sg.size account on ingress skb



When converting a skb to msg->sg we forget to set the size after the
latest ktls/tls code conversion. This patch can be reached by doing
a redir into ingress path from BPF skb sock recv hook. Then trying to
read the size fails.

Fix this by setting the size.

Fixes: 604326b4 ("bpf, sockmap: convert to generic sk_msg interface")
Signed-off-by: John Fastabend <john.fastabend@gmail.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

parent c42253cc

net/core/skmsg.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -411,6 +411,7 @@ static int sk_psock_skb_ingress(struct sk_psock psock, struct sk_buff skb)
		sk_mem_charge(sk, skb->len);
		copied = skb->len;
		msg->sg.start = 0;
		msg->sg.size = copied;
		msg->sg.end = num_sge == MAX_MSG_FRAGS ? 0 : num_sge;
		msg->skb = skb;

Admin message