p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ipv6: use ->ndo_tunnel_ctl in addrconf_set_dstaddr 

Use the new ->ndo_tunnel_ctl instead of overriding the address limit
and using ->ndo_do_ioctl just to do a pointless user copy.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Christoph Hellwig 2020-05-19 15:03:19 +02:00 committed by David S. Miller
parent 68ad6886dd
commit 8e3db0bbb2
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/ipv6/addrconf.c
View File

@ -2787,8 +2787,6 @@ static int addrconf_set_sit_dstaddr(struct net *net, struct net_device *dev,
struct in6_ifreq *ireq) struct in6_ifreq *ireq)
{ {
struct ip_tunnel_parm p = { }; struct ip_tunnel_parm p = { };
mm_segment_t oldfs = get_fs();
struct ifreq ifr;
int err; int err;
if (!(ipv6_addr_type(&ireq->ifr6_addr) & IPV6_ADDR_COMPATv4)) if (!(ipv6_addr_type(&ireq->ifr6_addr) & IPV6_ADDR_COMPATv4))
@ -2799,13 +2797,10 @@ static int addrconf_set_sit_dstaddr(struct net *net, struct net_device *dev,
p.iph.ihl = 5; p.iph.ihl = 5;
p.iph.protocol = IPPROTO_IPV6; p.iph.protocol = IPPROTO_IPV6;
p.iph.ttl = 64; p.iph.ttl = 64;
ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
if (!dev->netdev_ops->ndo_do_ioctl) if (!dev->netdev_ops->ndo_tunnel_ctl)
return -EOPNOTSUPP; return -EOPNOTSUPP;
set_fs(KERNEL_DS); err = dev->netdev_ops->ndo_tunnel_ctl(dev, &p, SIOCADDTUNNEL);
err = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCADDTUNNEL);
set_fs(oldfs);
if (err) if (err)
return err; return err;