]> git.baikalelectronics.ru Git - kernel.git/commit
gre: fix a regression in ioctl
authorCong Wang <amwang@redhat.com>
Sat, 29 Jun 2013 04:02:59 +0000 (12:02 +0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 2 Jul 2013 06:35:22 +0000 (23:35 -0700)
commit51bdad65bbe1f9312f026b49fa60e7de66d2fa65
treea02a7d062d0f6bab77452123665c8f2d1ac3c674
parent964ed9de4964c628de6b690dbaff588d4c461cbe
gre: fix a regression in ioctl

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 65fe948e5424816c57428
("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>
net/ipv4/ip_gre.c