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

Commit e6fbace8 authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman
Browse files

ipv6: pointer math error in ip6_tnl_parse_tlv_enc_lim() 



[ Upstream commit 63117f09c768be05a0bf465911297dc76394f686 ]

Casting is a high precedence operation but "off" and "i" are in terms of
bytes so we need to have some parenthesis here.

Fixes: fbfa743a9d2a ("ipv6: fix ip6_tnl_parse_tlv_enc_lim()")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
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 a7fe4e5d

net/ipv6/ip6_tunnel.c

+1 −1
Original line number Diff line number Diff line
@@ -441,7 +441,7 @@ __u16 ip6_tnl_parse_tlv_enc_lim(struct sk_buff *skb, __u8 *raw) 
				if (i + sizeof(*tel) > optlen)

					break;



				tel = (struct ipv6_tlv_tnl_enc_lim *) skb->data + off + i;

				tel = (struct ipv6_tlv_tnl_enc_lim *)(skb->data + off + i);

				/* return index of option if found and valid */

				if (tel->type == IPV6_TLV_TNL_ENCAP_LIMIT &&

				    tel->length == 1)