aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2006-06-29 23:11:25 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2006-06-30 17:11:47 -0400
commit3820c3f3e41786322c0bb225b9c77b8deff869d1 (patch)
treea422ad9d119950af2d139849fe24e935ad9f0a22
parent598736c55622f7ea65b98f93c825ff95c433877c (diff)
[TCP]: Reset gso_segs if packet is dodgy
I wasn't paranoid enough in verifying GSO information. A bogus gso_segs could upset drivers as much as a bogus header would. Let's reset it in the per-protocol gso_segment functions. I didn't verify gso_size because that can be verified by the source of the dodgy packets. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv4/tcp.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 0336422c88a0..0bb0ac96d675 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -2166,13 +2166,19 @@ struct sk_buff *tcp_tso_segment(struct sk_buff *skb, int features)
2166 if (!pskb_may_pull(skb, thlen)) 2166 if (!pskb_may_pull(skb, thlen))
2167 goto out; 2167 goto out;
2168 2168
2169 segs = NULL;
2170 if (skb_gso_ok(skb, features | NETIF_F_GSO_ROBUST))
2171 goto out;
2172
2173 oldlen = (u16)~skb->len; 2169 oldlen = (u16)~skb->len;
2174 __skb_pull(skb, thlen); 2170 __skb_pull(skb, thlen);
2175 2171
2172 if (skb_gso_ok(skb, features | NETIF_F_GSO_ROBUST)) {
2173 /* Packet is from an untrusted source, reset gso_segs. */
2174 int mss = skb_shinfo(skb)->gso_size;
2175
2176 skb_shinfo(skb)->gso_segs = (skb->len + mss - 1) / mss;
2177
2178 segs = NULL;
2179 goto out;
2180 }
2181
2176 segs = skb_segment(skb, features); 2182 segs = skb_segment(skb, features);
2177 if (IS_ERR(segs)) 2183 if (IS_ERR(segs))
2178 goto out; 2184 goto out;