]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
tcp: len check is unnecessarily devastating, change to WARN_ON
authorIlpo Järvinen <ilpo.jarvinen@helsinki.fi>
Sat, 2 Apr 2011 04:47:41 +0000 (21:47 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 2 Apr 2011 04:47:41 +0000 (21:47 -0700)
All callers are prepared for alloc failures anyway, so this error
can safely be boomeranged to the callers domain without super
bad consequences. ...At worst the connection might go into a state
where each RTO tries to (unsuccessfully) re-fragment with such
a mis-sized value and eventually dies.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/tcp_output.c

index dfa5beb0c1c8c4819d8bd59a17b8a9328ed31a96..8b0d0167e44aa62b47277164db079f51746f4c46 100644 (file)
@@ -1003,7 +1003,8 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len,
        int nlen;
        u8 flags;
 
-       BUG_ON(len > skb->len);
+       if (WARN_ON(len > skb->len))
+               return -EINVAL;
 
        nsize = skb_headlen(skb) - len;
        if (nsize < 0)