From: Cong Wang <amwang@redhat•com>
To: netdev@vger•kernel.org
Cc: Pravin B Shelar <pshelar@nicira•com>,
"David S. Miller" <davem@davemloft•net>,
Cong Wang <amwang@redhat•com>
Subject: [Patch net-next v2] gre: fix a regression in ioctl
Date: Sat, 29 Jun 2013 10:24:32 +0800 [thread overview]
Message-ID: <1372472672-1900-1-git-send-email-amwang@redhat.com> (raw)
In-Reply-To: <1372471480-28992-1-git-send-email-amwang@redhat.com>
From: Cong Wang <amwang@redhat•com>
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 c54419321455631079c7d
("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 move it back inside 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>
---
v2: check TUNNEL_* flags
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index c326e86..354d78c 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -314,11 +314,6 @@ static int ipgre_tunnel_ioctl(struct net_device *dev,
if (copy_from_user(&p, ifr->ifr_ifru.ifru_data, sizeof(p)))
return -EFAULT;
- if (p.iph.version != 4 || p.iph.protocol != IPPROTO_GRE ||
- p.iph.ihl != 5 || (p.iph.frag_off&htons(~IP_DF)) ||
- ((p.i_flags|p.o_flags)&(GRE_VERSION|GRE_ROUTING))) {
- return -EINVAL;
- }
p.i_flags = gre_flags_to_tnl_flags(p.i_flags);
p.o_flags = gre_flags_to_tnl_flags(p.o_flags);
diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c
index 394cebc..dc7d7ac 100644
--- a/net/ipv4/ip_tunnel.c
+++ b/net/ipv4/ip_tunnel.c
@@ -712,6 +712,11 @@ int ip_tunnel_ioctl(struct net_device *dev, struct ip_tunnel_parm *p, int cmd)
case SIOCADDTUNNEL:
case SIOCCHGTUNNEL:
+ if (p->iph.version != 4 || p->iph.protocol != IPPROTO_GRE ||
+ p->iph.ihl != 5 || (p->iph.frag_off&htons(~IP_DF)) ||
+ ((p->i_flags|p->o_flags)&(TUNNEL_VERSION|TUNNEL_ROUTING)))
+ return -EINVAL;
+
err = -EPERM;
if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
goto done;
next prev parent reply other threads:[~2013-06-29 2:24 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-29 2:04 [Patch net-next] gre: fix a regression in ioctl Cong Wang
2013-06-29 2:16 ` Cong Wang
2013-06-29 2:24 ` Cong Wang [this message]
2013-06-29 3:28 ` [Patch net-next v2] " Pravin Shelar
2013-06-29 3:33 ` Cong Wang
2013-06-29 3:55 ` Cong Wang
2013-06-29 4:02 ` [Patch net-next v3] " Cong Wang
2013-06-29 18:42 ` Dmitry Kravkov
2013-07-01 2:06 ` Cong Wang
2013-07-02 6:36 ` David Miller
2013-06-29 15:52 ` [Patch net-next v2] " Sergei Shtylyov
2013-07-01 2:08 ` Cong Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1372472672-1900-1-git-send-email-amwang@redhat.com \
--to=amwang@redhat$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pshelar@nicira$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox