diff options
author | Wei Yongjun <yjwei@cn.fujitsu.com> | 2008-07-26 11:59:11 +0100 |
---|---|---|
committer | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2008-07-26 11:59:11 +0100 |
commit | 860239c56bbc7c830bdbcec93b140f22a5a5219b (patch) | |
tree | 52de988257064b33441f3a8341f6f2fac48a3fe4 /net | |
parent | 18e1d836002ad970f42736bad09b7be9cfe99545 (diff) | |
download | linux-860239c56bbc7c830bdbcec93b140f22a5a5219b.tar.gz linux-860239c56bbc7c830bdbcec93b140f22a5a5219b.tar.bz2 linux-860239c56bbc7c830bdbcec93b140f22a5a5219b.zip |
dccp: Add check for truncated ICMPv6 DCCP error packets
This patch adds a minimum-length check for ICMPv6 packets, as per the previous
patch for ICMPv4 payloads.
Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Diffstat (limited to 'net')
-rw-r--r-- | net/dccp/ipv6.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c index 25826b1bf685..5e1ee0da2c40 100644 --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c @@ -96,6 +96,12 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, __u64 seq; struct net *net = dev_net(skb->dev); + if (skb->len < offset + sizeof(*dh) || + skb->len < offset + __dccp_basic_hdr_len(dh)) { + ICMP6_INC_STATS_BH(__in6_dev_get(skb->dev), ICMP6_MIB_INERRORS); + return; + } + sk = inet6_lookup(net, &dccp_hashinfo, &hdr->daddr, dh->dccph_dport, &hdr->saddr, dh->dccph_sport, inet6_iif(skb)); |