diff options
| author | Christoph Hellwig <hch@lst.de> | 2020-05-19 15:03:19 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-19 15:45:12 -0700 |
| commit | 8e3db0bbb29aa8d135341c5327bae738e93932a7 (patch) | |
| tree | 1148ec17b76494a9b1aeda934468477c7c43ba48 /net/ipv6/addrconf.c | |
| parent | 68ad6886dd3fb7d0b336363a90ace55b22f0dcb9 (diff) | |
| download | linux-stable-8e3db0bbb29aa8d135341c5327bae738e93932a7.tar.gz linux-stable-8e3db0bbb29aa8d135341c5327bae738e93932a7.tar.bz2 linux-stable-8e3db0bbb29aa8d135341c5327bae738e93932a7.zip | |
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>
Diffstat (limited to 'net/ipv6/addrconf.c')
| -rw-r--r-- | net/ipv6/addrconf.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index c827edf87741..09cfbf5dd7ce 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -2787,8 +2787,6 @@ static int addrconf_set_sit_dstaddr(struct net *net, struct net_device *dev, struct in6_ifreq *ireq) { struct ip_tunnel_parm p = { }; - mm_segment_t oldfs = get_fs(); - struct ifreq ifr; int err; 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.protocol = IPPROTO_IPV6; 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; - set_fs(KERNEL_DS); - err = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCADDTUNNEL); - set_fs(oldfs); + err = dev->netdev_ops->ndo_tunnel_ctl(dev, &p, SIOCADDTUNNEL); if (err) return err; |