]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ipv6: pointer math error in ip6_tnl_parse_tlv_enc_lim()
authorDan Carpenter <dan.carpenter@oracle.com>
Wed, 1 Feb 2017 08:46:32 +0000 (11:46 +0300)
committerBen Hutchings <ben@decadent.org.uk>
Thu, 16 Mar 2017 02:27:24 +0000 (02:27 +0000)
[ 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: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
net/ipv6/ip6_tunnel.c

index 2a002ad9f688ab7061d759c0b01f918fd2f56d59..2879eb9a6049a8e19caff3aa926d82f2c790b09c 100644 (file)
@@ -443,7 +443,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)