diff --git a/[refs] b/[refs] index 2c2109753c19..a98423990fed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 70182ed23d2559345aadb3cfb6a68a7c1cc0aa39 +refs/heads/master: 01be8e5d59d7e6da5c425a31b43709c2a4a69b5d diff --git a/trunk/net/ipv6/mip6.c b/trunk/net/ipv6/mip6.c index 31445d09261e..70854035c131 100644 --- a/trunk/net/ipv6/mip6.c +++ b/trunk/net/ipv6/mip6.c @@ -234,6 +234,9 @@ static int mip6_destopt_reject(struct xfrm_state *x, struct sk_buff *skb, struct struct timeval stamp; int err = 0; + if (unlikely(fl->proto == IPPROTO_MH && fl->fl_mh_type <= IP6_MH_TYPE_MAX)) + goto out; + if (likely(opt->dsthao)) { offset = ipv6_find_tlv(skb, opt->dsthao, IPV6_TLV_HAO); if (likely(offset >= 0))