ipv6: accept 64k - 1 packet length in ip6_find_1stfragopt()
authorStefano Brivio <sbrivio@redhat.com>
Fri, 18 Aug 2017 12:40:53 +0000 (14:40 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 20 Sep 2017 06:22:04 +0000 (08:22 +0200)
commit76d3e7ff2362f1744d163bac6862215df661ed9b
tree8f7f61b68b7a43e03b601d5472a96b8611d1b639
parent5d7d2e03e0f01a992e3521b180c3d3e67905f269
ipv6: accept 64k - 1 packet length in ip6_find_1stfragopt()

[ Upstream commit 3de33e1ba0506723ab25734e098cf280ecc34756 ]

A packet length of exactly IPV6_MAXPLEN is allowed, we should
refuse parsing options only if the size is 64KiB or more.

While at it, remove one extra variable and one assignment which
were also introduced by the commit that introduced the size
check. Checking the sum 'offset + len' and only later adding
'len' to 'offset' doesn't provide any advantage over directly
summing to 'offset' and checking it.

Fixes: 6399f1fae4ec ("ipv6: avoid overflow of offset in ip6_find_1stfragopt")
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/ipv6/output_core.c