ipip: fix a regression in ioctl
authorCong Wang <amwang@redhat.com>
Tue, 2 Jul 2013 06:49:34 +0000 (14:49 +0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 2 Jul 2013 08:13:09 +0000 (01:13 -0700)
commit3b7b514f44bff05d26a6499c4d4fac2a83938e6e
tree348ddec500211ad6dea16f7725d26ae790446f7b
parente1558a93b61962710733dc8c11a2bc765607f1cd
ipip: fix a regression in ioctl

This is a regression introduced by
commit fd58156e456d9f68fe0448 (IPIP: Use ip-tunneling code.)

Similar to GRE tunnel, 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.

Also, the check for i_key, o_key etc. is suspicious too,
which did not exist before, reset them before passing
to ip_tunnel_ioctl().

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/ipip.c