summaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2017-02-01 11:46:32 +0300
committerBen Hutchings <ben@decadent.org.uk>2017-03-16 02:27:24 +0000
commite89ecd2cab25cfe85784b61b2e38a3686bc7ce09 (patch)
treec7ae570331295da91aa429eeba8951c3f173d4ef /net/ipv6
parentd3d9b59ab32160e3cc4edcf7e5fa7cecb53a7d25 (diff)
downloadlinux-stable-e89ecd2cab25cfe85784b61b2e38a3686bc7ce09.tar.gz
linux-stable-e89ecd2cab25cfe85784b61b2e38a3686bc7ce09.tar.bz2
linux-stable-e89ecd2cab25cfe85784b61b2e38a3686bc7ce09.zip
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: 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>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/ip6_tunnel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index 2a002ad9f688..2879eb9a6049 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -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)