Commit 0e719e3a authored by Oussama Ghorbel's avatar Oussama Ghorbel Committed by David S. Miller

ipv6: Fix the upper MTU limit in GRE tunnel

Unlike ipv4, the struct member hlen holds the length of the GRE and ipv6
headers. This length is also counted in dev->hard_header_len.
Perhaps, it's more clean to modify the hlen to count only the GRE header
without ipv6 header as the variable name suggest, but the simple way to fix
this without regression risk is simply modify the calculation of the limit
in ip6gre_tunnel_change_mtu function.
Verified in kernel version v3.11.
Signed-off-by: default avatarOussama Ghorbel <ou.ghorbel@gmail.com>
Acked-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dc62ccac
...@@ -1173,9 +1173,8 @@ static int ip6gre_tunnel_ioctl(struct net_device *dev, ...@@ -1173,9 +1173,8 @@ static int ip6gre_tunnel_ioctl(struct net_device *dev,
static int ip6gre_tunnel_change_mtu(struct net_device *dev, int new_mtu) static int ip6gre_tunnel_change_mtu(struct net_device *dev, int new_mtu)
{ {
struct ip6_tnl *tunnel = netdev_priv(dev);
if (new_mtu < 68 || if (new_mtu < 68 ||
new_mtu > 0xFFF8 - dev->hard_header_len - tunnel->hlen) new_mtu > 0xFFF8 - dev->hard_header_len)
return -EINVAL; return -EINVAL;
dev->mtu = new_mtu; dev->mtu = new_mtu;
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment