|
@@ -70,7 +70,7 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
|
|
|
u8 type, u8 code, int offset, __be32 info)
|
|
|
{
|
|
|
const struct ipv6hdr *hdr = (const struct ipv6hdr *)skb->data;
|
|
|
- const struct dccp_hdr *dh = (struct dccp_hdr *)(skb->data + offset);
|
|
|
+ const struct dccp_hdr *dh;
|
|
|
struct dccp_sock *dp;
|
|
|
struct ipv6_pinfo *np;
|
|
|
struct sock *sk;
|
|
@@ -78,12 +78,13 @@ 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(net, __in6_dev_get(skb->dev),
|
|
|
- ICMP6_MIB_INERRORS);
|
|
|
- return;
|
|
|
- }
|
|
|
+ /* Only need dccph_dport & dccph_sport which are the first
|
|
|
+ * 4 bytes in dccp header.
|
|
|
+ * Our caller (icmpv6_notify()) already pulled 8 bytes for us.
|
|
|
+ */
|
|
|
+ BUILD_BUG_ON(offsetofend(struct dccp_hdr, dccph_sport) > 8);
|
|
|
+ BUILD_BUG_ON(offsetofend(struct dccp_hdr, dccph_dport) > 8);
|
|
|
+ dh = (struct dccp_hdr *)(skb->data + offset);
|
|
|
|
|
|
sk = __inet6_lookup_established(net, &dccp_hashinfo,
|
|
|
&hdr->daddr, dh->dccph_dport,
|