diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-04 10:39:12 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-04 10:39:12 -0700 |
| commit | 083dd8b8aacfcb62d65fb53ec744090879dd8150 (patch) | |
| tree | d48017ad6caa13f5a31c23186b16c36a84776c49 /net/ipv4 | |
| parent | 95b8fbada76d978ce13a26785f8b85ff54478bb2 (diff) | |
| parent | a14b289d4614bb3b25d0455d68f72f3c7b4cc8e8 (diff) | |
| download | op-kernel-dev-083dd8b8aacfcb62d65fb53ec744090879dd8150.zip op-kernel-dev-083dd8b8aacfcb62d65fb53ec744090879dd8150.tar.gz | |
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 dfa5beb..8b0d016 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, 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) |
