leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gre: fix a regression in ioctl

Browse Source 
When testing GRE tunnel, I got:

 # ip tunnel show
 get tunnel gre0 failed: Invalid argument
 get tunnel gre1 failed: Invalid argument

This is a regression introduced by commit c544193214
("GRE: Refactor GRE tunneling code.") because previously we
only check the parameters for SIOCADDTUNNEL and SIOCCHGTUNNEL,
after that commit, the check is moved for all commands.

So, just check for SIOCADDTUNNEL and SIOCCHGTUNNEL.

After this patch I got:

 # ip tunnel show
 gre0: gre/ip  remote any  local any  ttl inherit  nopmtudisc
 gre1: gre/ip  remote 192.168.122.101  local 192.168.122.45  ttl inherit

Cc: Pravin B Shelar <pshelar@nicira.com>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Cong Wang 2013-06-29 12:02:59 +08:00 committed by David S. Miller
parent bb33381d0c
commit 6c734fb859
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/ipv4/ip_gre.c
View File

@ -314,10 +314,11 @@ static int ipgre_tunnel_ioctl(struct net_device *dev,
if (copy_from_user(&p, ifr->ifr_ifru.ifru_data, sizeof(p))) if (copy_from_user(&p, ifr->ifr_ifru.ifru_data, sizeof(p)))
return -EFAULT; return -EFAULT;
if (p.iph.version != 4 || p.iph.protocol != IPPROTO_GRE || if (cmd == SIOCADDTUNNEL || cmd == SIOCCHGTUNNEL) {
p.iph.ihl != 5 || (p.iph.frag_off&htons(~IP_DF)) || if (p.iph.version != 4 || p.iph.protocol != IPPROTO_GRE ||
((p.i_flags|p.o_flags)&(GRE_VERSION|GRE_ROUTING))) { p.iph.ihl != 5 || (p.iph.frag_off&htons(~IP_DF)) ||
return -EINVAL; ((p.i_flags|p.o_flags)&(GRE_VERSION|GRE_ROUTING)))
return -EINVAL;
} }
p.i_flags = gre_flags_to_tnl_flags(p.i_flags); p.i_flags = gre_flags_to_tnl_flags(p.i_flags);
p.o_flags = gre_flags_to_tnl_flags(p.o_flags); p.o_flags = gre_flags_to_tnl_flags(p.o_flags);