Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53c94358 authored by Sabrina Dubroca's avatar Sabrina Dubroca Committed by Greg Kroah-Hartman
Browse files

ip6_gre: fix endianness errors in ip6gre_err 



commit d1e158e2d7a0a91110b206653f0e02376e809150 upstream.

info is in network byte order, change it back to host byte order
before use. In particular, the current code sets the MTU of the tunnel
to a wrong (too big) value.

Fixes: c12b395a ("gre: Support GRE over IPv6")
Signed-off-by: default avatarSabrina Dubroca <sd@queasysnail.net>
Acked-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c8443922

net/ipv6/ip6_gre.c

+2 −2
Original line number Diff line number Diff line
@@ -421,7 +421,7 @@ static void ip6gre_err(struct sk_buff *skb, struct inet6_skb_parm *opt, 
		if (code == ICMPV6_HDR_FIELD)

			teli = ip6_tnl_parse_tlv_enc_lim(skb, skb->data);



		if (teli && teli == info - 2) {

		if (teli && teli == be32_to_cpu(info) - 2) {

			tel = (struct ipv6_tlv_tnl_enc_lim *) &skb->data[teli];

			if (tel->encap_limit == 0) {

				net_warn_ratelimited("%s: Too small encapsulation limit or routing loop in tunnel!\n",
@@ -433,7 +433,7 @@ static void ip6gre_err(struct sk_buff *skb, struct inet6_skb_parm *opt, 
		}

		break;

	case ICMPV6_PKT_TOOBIG:

		mtu = info - offset;

		mtu = be32_to_cpu(info) - offset;

		if (mtu < IPV6_MIN_MTU)

			mtu = IPV6_MIN_MTU;

		t->dev->mtu = mtu;