Patch "gso: validate gso_type in GSO handlers" has been added to the 4.14-stable tree
Subsystems (5)
This is a note to let you know that I've just added the patch titled
gso: validate gso_type in GSO handlers
to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
gso-validate-gso_type-in-gso-handlers.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Sun Jan 28 17:35:08 CET 2018
From: Willem de Bruijn <[email protected]>
Date: Fri, 19 Jan 2018 09:29:18 -0500
Subject: gso: validate gso_type in GSO handlers
From: Willem de Bruijn <[email protected]>
[ Upstream commit 121d57af308d0cf943f08f4738d24d3966c38cd9 ]
Validate gso_type during segmentation as SKB_GSO_DODGY sources may pass packets where the gso_type does not match the contents.
Syzkaller was able to enter the SCTP gso handler with a packet of gso_type SKB_GSO_TCPV4.
On entry of transport layer gso handlers, verify that the gso_type matches the transport protocol.
--- net/ipv4/esp4_offload.c | 3 +++ net/ipv4/tcp_offload.c | 3 +++ net/ipv4/udp_offload.c | 3 +++ net/ipv6/esp6_offload.c | 3 +++ net/ipv6/tcpv6_offload.c | 3 +++ net/ipv6/udp_offload.c | 3 +++ net/sctp/offload.c | 3 +++ 7 files changed, 21 insertions(+)
net/ipv4/esp4_offload.c +3 -0
@@ -121,6 +121,9 @@ static struct sk_buff *esp4_gso_segment(if (!xo) goto out; +if (!(skb_shinfo (skb)->gso_type &SKB_GSO_ESP )) + goto out; + seq = xo->seq.low; x = skb->sp->xvec[skb->sp->len -1 ];
net/ipv4/tcp_offload.c +3 -0
@@ -32,6 +32,9 @@ static void tcp_gso_tstamp(struct sk_bufstatic struct sk_buff *tcp4_gso_segment (struct sk_buff *skb,netdev_features_t features) { +if (!(skb_shinfo (skb)->gso_type &SKB_GSO_TCPV4 )) +return ERR_PTR (-EINVAL ); +if (!pskb_may_pull (skb,sizeof (struct tcphdr )))return ERR_PTR (-EINVAL );
net/ipv4/udp_offload.c +3 -0
@@ -203,6 +203,9 @@ static struct sk_buff *udp4_ufo_fragment goto out; } +if (!(skb_shinfo (skb)->gso_type &SKB_GSO_UDP )) + goto out; +if (!pskb_may_pull (skb,sizeof (struct udphdr ))) goto out;
net/ipv6/esp6_offload.c +3 -0
@@ -148,6 +148,9 @@ static struct sk_buff *esp6_gso_segment(if (!xo) goto out; +if (!(skb_shinfo (skb)->gso_type &SKB_GSO_ESP )) + goto out; + seq = xo->seq.low; x = skb->sp->xvec[skb->sp->len -1 ];
net/ipv6/tcpv6_offload.c +3 -0
@@ -46,6 +46,9 @@ static struct sk_buff *tcp6_gso_segment( {struct tcphdr *th; +if (!(skb_shinfo (skb)->gso_type &SKB_GSO_TCPV6 )) +return ERR_PTR (-EINVAL ); +if (!pskb_may_pull (skb,sizeof (*th)))return ERR_PTR (-EINVAL );
net/ipv6/udp_offload.c +3 -0
@@ -42,6 +42,9 @@ static struct sk_buff *udp6_ufo_fragmentconst struct ipv6hdr *ipv6h;struct udphdr *uh; +if (!(skb_shinfo (skb)->gso_type &SKB_GSO_UDP )) + goto out; +if (!pskb_may_pull (skb,sizeof (struct udphdr ))) goto out;
net/sctp/offload.c +3 -0
@@ -45,6 +45,9 @@ static struct sk_buff *sctp_gso_segment(struct sk_buff *segs =ERR_PTR (-EINVAL );struct sctphdr *sh; +if (!(skb_shinfo (skb)->gso_type &SKB_GSO_SCTP )) + goto out; + sh =sctp_hdr (skb);if (!pskb_may_pull (skb,sizeof (*sh))) goto out;
Patches currently in stable-queue which might be from [email protected] are
queue-4.14/gso-validate-gso_type-in-gso-handlers.patch queue-4.14/flow_dissector-properly-cap-thoff-field.patch queue-4.14/net-qdisc_pkt_len_init-should-be-more-robust.patch