net: be more gentle about silly gso requests coming from user
Subsystems (4)
PATCH 1/1 net: be more gentle about silly gso requests coming from user
Recent change in virtio_net_hdr_to_skb() broke some packetdrill tests.
When --mss=XXX option is set, packetdrill always provide gso_type & gso_size for its inbound packets, regardless of packet size.
if (packet->tcp && packet->mss) {
if (packet->ipv4)
gso.gso_type = VIRTIO_NET_HDR_GSO_TCPV4;
else
gso.gso_type = VIRTIO_NET_HDR_GSO_TCPV6;
gso.gso_size = packet->mss;
}Since many other programs could do the same, relax virtio_net_hdr_to_skb() to no longer return an error, but instead ignore gso settings.
This keeps Willem intent to make sure no malicious packet could reach gso stack.
Note that TCP stack has a special logic in tcp_set_skb_tso_segs() to clear gso_size for small packets.
--- include/linux/virtio_net.h | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
include/linux/virtio_net.h +9 -8
@@ -109,16 +109,17 @@ static inline int virtio_net_hdr_to_skb(struct sk_buff *skb,if (hdr->gso_type !=VIRTIO_NET_HDR_GSO_NONE ) {u16 gso_size =__virtio16_to_cpu (little_endian, hdr->gso_size); +struct skb_shared_info *shinfo =skb_shinfo (skb); -if (skb->len - p_off <= gso_size) -return -EINVAL ; +/* Too small packets are not really GSO ones. */ +if (skb->len - p_off > gso_size) { + shinfo->gso_size = gso_size; + shinfo->gso_type = gso_type; -skb_shinfo (skb)->gso_size = gso_size; -skb_shinfo (skb)->gso_type = gso_type; - -/* Header must be checked, and gso_segs computed. */ -skb_shinfo (skb)->gso_type |=SKB_GSO_DODGY ; -skb_shinfo (skb)->gso_segs =0 ; +/* Header must be checked, and gso_segs computed. */ + shinfo->gso_type |=SKB_GSO_DODGY ; + shinfo->gso_segs =0 ; + } }return 0 ;
Signature · 1 line
2.27.0.rc2.251.g90737beb825-goog
Quoted 20 lines · Eric Dumazet
Recent change in
virtio_net_hdr_to_skb()broke some packetdrill tests.When --mss=XXX option is set, packetdrill always provide
gso_type&gso_sizefor its inbound packets, regardless of packet size.if (packet->tcp && packet->mss) { if (packet->ipv4) gso.gso_type = VIRTIO_NET_HDR_GSO_TCPV4; else gso.gso_type = VIRTIO_NET_HDR_GSO_TCPV6; gso.gso_size = packet->mss; }Since many other programs could do the same, relax
virtio_net_hdr_to_skb()to no longer return an error, but instead ignore gso settings.This keeps Willem intent to make sure no malicious packet could reach gso stack.
Quoted 6 lines
Note that TCP stack has a special logic in
tcp_set_skb_tso_segs()to cleargso_sizefor small packets.Fixes 6dd912f82680 ("net: check untrusted gso_size at kernel entry")Signed-off-by Eric Dumazet <[email protected]>Cc Willem de Bruijn <[email protected]>
Thanks a lot for fixing this immediately, Eric.
David Miller
maintainerFrom: Eric Dumazet <[email protected]>
Date: Thu, 28 May 2020 14:57:47 -0700
Quoted 16 lines
Recent change in
virtio_net_hdr_to_skb()broke some packetdrill tests.When --mss=XXX option is set, packetdrill always provide
gso_type&gso_sizefor its inbound packets, regardless of packet size.if (packet->tcp && packet->mss) { if (packet->ipv4) gso.gso_type = VIRTIO_NET_HDR_GSO_TCPV4; else gso.gso_type = VIRTIO_NET_HDR_GSO_TCPV6; gso.gso_size = packet->mss; }Since many other programs could do the same, relax
virtio_net_hdr_to_skb()to no longer return an error, but instead ignore gso settings.
Quoted 8 lines
This keeps Willem intent to make sure no malicious packet could reach gso stack.
Note that TCP stack has a special logic in
tcp_set_skb_tso_segs()to cleargso_sizefor small packets.Fixes 6dd912f82680 ("net: check untrusted gso_size at kernel entry")Signed-off-by Eric Dumazet <[email protected]>
Applied and queued up for -stable, thanks Eric.