Skip to content

L
linux
Commit cec5ae5c authored by Ville Nuorvala's avatar Ville Nuorvala Committed by David S. Miller
Browse files
Options

[IPV6]: Fix two bugs in ip6_tunnel.c ICMP error handling. 

Fix byte order of info parameter in ip6ip6_err().
parent b1c0e7cb
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
net/ipv6/ip6_tunnel.c
View file @ cec5ae5c
...@@ -421,7 +421,7 @@ void ip6ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, ...@@ -421,7 +421,7 @@ void ip6ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
} }
teli = parse_tlv_tnl_enc_lim(skb, skb->data); teli = parse_tlv_tnl_enc_lim(skb, skb->data);
if (teli && teli == info - 2) { if (teli && teli == ntohl(info) - 2) {
tel = (struct ipv6_tlv_tnl_enc_lim *) &skb->data[teli]; tel = (struct ipv6_tlv_tnl_enc_lim *) &skb->data[teli];
if (tel->encap_limit == 0) { if (tel->encap_limit == 0) {
if (net_ratelimit()) if (net_ratelimit())
...@@ -434,10 +434,9 @@ void ip6ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, ...@@ -434,10 +434,9 @@ void ip6ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
} }
break; break;
case ICMPV6_PKT_TOOBIG: case ICMPV6_PKT_TOOBIG:
mtu = info - offset; mtu = ntohl(info) - offset;
if (mtu <= IPV6_MIN_MTU) { if (mtu < IPV6_MIN_MTU)
mtu = IPV6_MIN_MTU; mtu = IPV6_MIN_MTU;
}
t->dev->mtu = mtu; t->dev->mtu = mtu;
if ((len = sizeof (*ipv6h) + ipv6h->payload_len) > mtu) { if ((len = sizeof (*ipv6h) + ipv6h->payload_len) > mtu) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7