Commit f41fe3c2 authored by Tom Herbert's avatar Tom Herbert Committed by David S. Miller
Browse files

gre6: Fix flag translations 



GRE for IPv6 does not properly translate for GRE flags to tunnel
flags and vice versa. This patch fixes that.

Signed-off-by: default avatarTom Herbert <tom@herbertland.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent db2ec95d

net/ipv6/ip6_gre.c

+12 −8
Original line number Diff line number Diff line
@@ -795,8 +795,8 @@ static void ip6gre_tnl_parm_from_user(struct __ip6_tnl_parm *p, 
	p->link = u->link;

	p->i_key = u->i_key;

	p->o_key = u->o_key;

	p->i_flags = u->i_flags;

	p->o_flags = u->o_flags;

	p->i_flags = gre_flags_to_tnl_flags(u->i_flags);

	p->o_flags = gre_flags_to_tnl_flags(u->o_flags);

	memcpy(p->name, u->name, sizeof(u->name));

}
@@ -813,8 +813,8 @@ static void ip6gre_tnl_parm_to_user(struct ip6_tnl_parm2 *u, 
	u->link = p->link;

	u->i_key = p->i_key;

	u->o_key = p->o_key;

	u->i_flags = p->i_flags;

	u->o_flags = p->o_flags;

	u->i_flags = gre_tnl_flags_to_gre_flags(p->i_flags);

	u->o_flags = gre_tnl_flags_to_gre_flags(p->o_flags);

	memcpy(u->name, p->name, sizeof(u->name));

}
@@ -1214,10 +1214,12 @@ static void ip6gre_netlink_parms(struct nlattr *data[], 
		parms->link = nla_get_u32(data[IFLA_GRE_LINK]);



	if (data[IFLA_GRE_IFLAGS])

		parms->i_flags = nla_get_be16(data[IFLA_GRE_IFLAGS]);

		parms->i_flags = gre_flags_to_tnl_flags(

				nla_get_be16(data[IFLA_GRE_IFLAGS]));



	if (data[IFLA_GRE_OFLAGS])

		parms->o_flags = nla_get_be16(data[IFLA_GRE_OFLAGS]);

		parms->o_flags = gre_flags_to_tnl_flags(

				nla_get_be16(data[IFLA_GRE_OFLAGS]));



	if (data[IFLA_GRE_IKEY])

		parms->i_key = nla_get_be32(data[IFLA_GRE_IKEY]);
@@ -1409,8 +1411,10 @@ static int ip6gre_fill_info(struct sk_buff *skb, const struct net_device *dev) 
	struct __ip6_tnl_parm *p = &t->parms;



	if (nla_put_u32(skb, IFLA_GRE_LINK, p->link) ||

	    nla_put_be16(skb, IFLA_GRE_IFLAGS, p->i_flags) ||

	    nla_put_be16(skb, IFLA_GRE_OFLAGS, p->o_flags) ||

	    nla_put_be16(skb, IFLA_GRE_IFLAGS,

			 gre_tnl_flags_to_gre_flags(p->i_flags)) ||

	    nla_put_be16(skb, IFLA_GRE_OFLAGS,

			 gre_tnl_flags_to_gre_flags(p->o_flags)) ||

	    nla_put_be32(skb, IFLA_GRE_IKEY, p->i_key) ||

	    nla_put_be32(skb, IFLA_GRE_OKEY, p->o_key) ||

	    nla_put_in6_addr(skb, IFLA_GRE_LOCAL, &p->laddr) ||