diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-04 13:39:12 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-04 13:39:12 -0400 |
| commit | 083dd8b8aacfcb62d65fb53ec744090879dd8150 (patch) | |
| tree | d48017ad6caa13f5a31c23186b16c36a84776c49 /net/ipv4 | |
| parent | 95b8fbada76d978ce13a26785f8b85ff54478bb2 (diff) | |
| parent | a14b289d4614bb3b25d0455d68f72f3c7b4cc8e8 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/tcp_output.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index dfa5beb0c1c8..8b0d0167e44a 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
| @@ -1003,7 +1003,8 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len, | |||
| 1003 | int nlen; | 1003 | int nlen; |
| 1004 | u8 flags; | 1004 | u8 flags; |
| 1005 | 1005 | ||
| 1006 | BUG_ON(len > skb->len); | 1006 | if (WARN_ON(len > skb->len)) |
| 1007 | return -EINVAL; | ||
| 1007 | 1008 | ||
| 1008 | nsize = skb_headlen(skb) - len; | 1009 | nsize = skb_headlen(skb) - len; |
| 1009 | if (nsize < 0) | 1010 | if (nsize < 0) |