ipip: fix a regression in ioctl (3b7b514f) · Commits · 戴 / test

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

+7 −5

Original line number	Original line	Diff line number	Diff line
	@@ -244,11 +244,13 @@ ipip_tunnel_ioctl(struct net_device dev, struct ifreq ifr, int cmd)
	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 (cmd == SIOCADDTUNNEL \|\| cmd == SIOCCHGTUNNEL) {
	if (p.iph.version != 4 \|\| p.iph.protocol != IPPROTO_IPIP \|\|		if (p.iph.version != 4 \|\| p.iph.protocol != IPPROTO_IPIP \|\|
	p.iph.ihl != 5 \|\| (p.iph.frag_off&htons(~IP_DF)))		p.iph.ihl != 5 \|\| (p.iph.frag_off&htons(~IP_DF)))
	return -EINVAL;		return -EINVAL;
	if (p.i_key \|\| p.o_key \|\| p.i_flags \|\| p.o_flags)		}
	return -EINVAL;
			p.i_key = p.o_key = p.i_flags = p.o_flags = 0;
	if (p.iph.ttl)		if (p.iph.ttl)
	p.iph.frag_off \|= htons(IP_DF);		p.iph.frag_off \|= htons(IP_DF);

Admin message