]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit912931e6d81257f513e2274b32871f9a38f7fdda
tree348ddec500211ad6dea16f7725d26ae790446f7b
parent92befadee0d0013b579d67df1d6e7d18300aacd4
ipip: fix a regression in ioctl

This is a regression introduced by
commit e8b723ac83325a435f988a (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