summaryrefslogtreecommitdiffstats
path: root/net/ipv4/ipmr.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2020-05-19 15:03:14 +0200
committerDavid S. Miller <davem@davemloft.net>2020-05-20 00:45:12 +0200
commitc7e3670516042bfd8147151d9008b5874a6eb73e (patch)
tree83ef88c2305ed56ec5985b0e1b626d42723fb54a /net/ipv4/ipmr.c
parentnet: add a new ndo_tunnel_ioctl method (diff)
downloadlinux-c7e3670516042bfd8147151d9008b5874a6eb73e.tar.xz
linux-c7e3670516042bfd8147151d9008b5874a6eb73e.zip
impr: use ->ndo_tunnel_ctl in ipmr_new_tunnel
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/ipv4/ipmr.c')
-rw-r--r--net/ipv4/ipmr.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index cd1a3260a99a..d3e9b80a57de 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -442,8 +442,6 @@ static struct net_device *ipmr_new_tunnel(struct net *net, struct vifctl *v)
{
struct net_device *tunnel_dev, *new_dev;
struct ip_tunnel_parm p = { };
- mm_segment_t oldfs = get_fs();
- struct ifreq ifr;
int err;
tunnel_dev = __dev_get_by_name(net, "tunl0");
@@ -456,15 +454,11 @@ static struct net_device *ipmr_new_tunnel(struct net *net, struct vifctl *v)
p.iph.ihl = 5;
p.iph.protocol = IPPROTO_IPIP;
sprintf(p.name, "dvmrp%d", v->vifc_vifi);
- ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
- if (!tunnel_dev->netdev_ops->ndo_do_ioctl)
+ if (!tunnel_dev->netdev_ops->ndo_tunnel_ctl)
goto out;
-
- set_fs(KERNEL_DS);
- err = tunnel_dev->netdev_ops->ndo_do_ioctl(tunnel_dev, &ifr,
+ err = tunnel_dev->netdev_ops->ndo_tunnel_ctl(tunnel_dev, &p,
SIOCADDTUNNEL);
- set_fs(oldfs);
if (err)
goto out;
@@ -481,10 +475,8 @@ static struct net_device *ipmr_new_tunnel(struct net *net, struct vifctl *v)
err = dev_set_allmulti(new_dev, 1);
if (err) {
dev_close(new_dev);
- set_fs(KERNEL_DS);
- tunnel_dev->netdev_ops->ndo_do_ioctl(tunnel_dev, &ifr,
+ tunnel_dev->netdev_ops->ndo_tunnel_ctl(tunnel_dev, &p,
SIOCDELTUNNEL);
- set_fs(oldfs);
dev_put(new_dev);
new_dev = ERR_PTR(err);
}