mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-01 03:11:59 +00:00
sit: impement ->ndo_tunnel_ctl
Implement the ->ndo_tunnel_ctl method, and use ip_tunnel_ioctl to handle userspace requests for the SIOCGETTUNNEL, SIOCADDTUNNEL, SIOCCHGTUNNEL and SIOCDELTUNNEL ioctls. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
fd5d687b76
commit
f60fe2df93
1 changed files with 34 additions and 39 deletions
|
@ -1267,60 +1267,45 @@ __ipip6_tunnel_ioctl_validate(struct net *net, struct ip_tunnel_parm *p)
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
ipip6_tunnel_get(struct net_device *dev, struct ifreq *ifr)
|
ipip6_tunnel_get(struct net_device *dev, struct ip_tunnel_parm *p)
|
||||||
{
|
{
|
||||||
struct ip_tunnel *t = netdev_priv(dev);
|
struct ip_tunnel *t = netdev_priv(dev);
|
||||||
struct ip_tunnel_parm p;
|
|
||||||
|
|
||||||
if (dev == dev_to_sit_net(dev)->fb_tunnel_dev) {
|
if (dev == dev_to_sit_net(dev)->fb_tunnel_dev)
|
||||||
if (copy_from_user(&p, ifr->ifr_ifru.ifru_data, sizeof(p)))
|
t = ipip6_tunnel_locate(t->net, p, 0);
|
||||||
return -EFAULT;
|
|
||||||
t = ipip6_tunnel_locate(t->net, &p, 0);
|
|
||||||
}
|
|
||||||
if (!t)
|
if (!t)
|
||||||
t = netdev_priv(dev);
|
t = netdev_priv(dev);
|
||||||
|
memcpy(p, &t->parms, sizeof(*p));
|
||||||
if (copy_to_user(ifr->ifr_ifru.ifru_data, &t->parms, sizeof(p)))
|
|
||||||
return -EFAULT;
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
ipip6_tunnel_add(struct net_device *dev, struct ifreq *ifr)
|
ipip6_tunnel_add(struct net_device *dev, struct ip_tunnel_parm *p)
|
||||||
{
|
{
|
||||||
struct ip_tunnel *t = netdev_priv(dev);
|
struct ip_tunnel *t = netdev_priv(dev);
|
||||||
struct ip_tunnel_parm p;
|
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
if (copy_from_user(&p, ifr->ifr_ifru.ifru_data, sizeof(p)))
|
err = __ipip6_tunnel_ioctl_validate(t->net, p);
|
||||||
return -EFAULT;
|
|
||||||
err = __ipip6_tunnel_ioctl_validate(t->net, &p);
|
|
||||||
if (err)
|
if (err)
|
||||||
return err;
|
return err;
|
||||||
|
|
||||||
t = ipip6_tunnel_locate(t->net, &p, 1);
|
t = ipip6_tunnel_locate(t->net, p, 1);
|
||||||
if (!t)
|
if (!t)
|
||||||
return -ENOBUFS;
|
return -ENOBUFS;
|
||||||
|
|
||||||
if (copy_to_user(ifr->ifr_ifru.ifru_data, &t->parms, sizeof(p)))
|
|
||||||
return -EFAULT;
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
ipip6_tunnel_change(struct net_device *dev, struct ifreq *ifr)
|
ipip6_tunnel_change(struct net_device *dev, struct ip_tunnel_parm *p)
|
||||||
{
|
{
|
||||||
struct ip_tunnel *t = netdev_priv(dev);
|
struct ip_tunnel *t = netdev_priv(dev);
|
||||||
struct ip_tunnel_parm p;
|
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
if (copy_from_user(&p, ifr->ifr_ifru.ifru_data, sizeof(p)))
|
err = __ipip6_tunnel_ioctl_validate(t->net, p);
|
||||||
return -EFAULT;
|
|
||||||
err = __ipip6_tunnel_ioctl_validate(t->net, &p);
|
|
||||||
if (err)
|
if (err)
|
||||||
return err;
|
return err;
|
||||||
|
|
||||||
t = ipip6_tunnel_locate(t->net, &p, 0);
|
t = ipip6_tunnel_locate(t->net, p, 0);
|
||||||
if (dev == dev_to_sit_net(dev)->fb_tunnel_dev) {
|
if (dev == dev_to_sit_net(dev)->fb_tunnel_dev) {
|
||||||
if (!t)
|
if (!t)
|
||||||
return -ENOENT;
|
return -ENOENT;
|
||||||
|
@ -1329,33 +1314,28 @@ ipip6_tunnel_change(struct net_device *dev, struct ifreq *ifr)
|
||||||
if (t->dev != dev)
|
if (t->dev != dev)
|
||||||
return -EEXIST;
|
return -EEXIST;
|
||||||
} else {
|
} else {
|
||||||
if (((dev->flags & IFF_POINTOPOINT) && !p.iph.daddr) ||
|
if (((dev->flags & IFF_POINTOPOINT) && !p->iph.daddr) ||
|
||||||
(!(dev->flags & IFF_POINTOPOINT) && p.iph.daddr))
|
(!(dev->flags & IFF_POINTOPOINT) && p->iph.daddr))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
t = netdev_priv(dev);
|
t = netdev_priv(dev);
|
||||||
}
|
}
|
||||||
|
|
||||||
ipip6_tunnel_update(t, &p, t->fwmark);
|
ipip6_tunnel_update(t, p, t->fwmark);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (copy_to_user(ifr->ifr_ifru.ifru_data, &t->parms, sizeof(p)))
|
|
||||||
return -EFAULT;
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
ipip6_tunnel_del(struct net_device *dev, struct ifreq *ifr)
|
ipip6_tunnel_del(struct net_device *dev, struct ip_tunnel_parm *p)
|
||||||
{
|
{
|
||||||
struct ip_tunnel *t = netdev_priv(dev);
|
struct ip_tunnel *t = netdev_priv(dev);
|
||||||
struct ip_tunnel_parm p;
|
|
||||||
|
|
||||||
if (!ns_capable(t->net->user_ns, CAP_NET_ADMIN))
|
if (!ns_capable(t->net->user_ns, CAP_NET_ADMIN))
|
||||||
return -EPERM;
|
return -EPERM;
|
||||||
|
|
||||||
if (dev == dev_to_sit_net(dev)->fb_tunnel_dev) {
|
if (dev == dev_to_sit_net(dev)->fb_tunnel_dev) {
|
||||||
if (copy_from_user(&p, ifr->ifr_ifru.ifru_data, sizeof(p)))
|
t = ipip6_tunnel_locate(t->net, p, 0);
|
||||||
return -EFAULT;
|
|
||||||
t = ipip6_tunnel_locate(t->net, &p, 0);
|
|
||||||
if (!t)
|
if (!t)
|
||||||
return -ENOENT;
|
return -ENOENT;
|
||||||
if (t == netdev_priv(dev_to_sit_net(dev)->fb_tunnel_dev))
|
if (t == netdev_priv(dev_to_sit_net(dev)->fb_tunnel_dev))
|
||||||
|
@ -1366,18 +1346,32 @@ ipip6_tunnel_del(struct net_device *dev, struct ifreq *ifr)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int
|
||||||
|
ipip6_tunnel_ctl(struct net_device *dev, struct ip_tunnel_parm *p, int cmd)
|
||||||
|
{
|
||||||
|
switch (cmd) {
|
||||||
|
case SIOCGETTUNNEL:
|
||||||
|
return ipip6_tunnel_get(dev, p);
|
||||||
|
case SIOCADDTUNNEL:
|
||||||
|
return ipip6_tunnel_add(dev, p);
|
||||||
|
case SIOCCHGTUNNEL:
|
||||||
|
return ipip6_tunnel_change(dev, p);
|
||||||
|
case SIOCDELTUNNEL:
|
||||||
|
return ipip6_tunnel_del(dev, p);
|
||||||
|
default:
|
||||||
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
ipip6_tunnel_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
|
ipip6_tunnel_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
|
||||||
{
|
{
|
||||||
switch (cmd) {
|
switch (cmd) {
|
||||||
case SIOCGETTUNNEL:
|
case SIOCGETTUNNEL:
|
||||||
return ipip6_tunnel_get(dev, ifr);
|
|
||||||
case SIOCADDTUNNEL:
|
case SIOCADDTUNNEL:
|
||||||
return ipip6_tunnel_add(dev, ifr);
|
|
||||||
case SIOCCHGTUNNEL:
|
case SIOCCHGTUNNEL:
|
||||||
return ipip6_tunnel_change(dev, ifr);
|
|
||||||
case SIOCDELTUNNEL:
|
case SIOCDELTUNNEL:
|
||||||
return ipip6_tunnel_del(dev, ifr);
|
return ip_tunnel_ioctl(dev, ifr, cmd);
|
||||||
case SIOCGETPRL:
|
case SIOCGETPRL:
|
||||||
return ipip6_tunnel_get_prl(dev, ifr);
|
return ipip6_tunnel_get_prl(dev, ifr);
|
||||||
case SIOCADDPRL:
|
case SIOCADDPRL:
|
||||||
|
@ -1404,6 +1398,7 @@ static const struct net_device_ops ipip6_netdev_ops = {
|
||||||
.ndo_do_ioctl = ipip6_tunnel_ioctl,
|
.ndo_do_ioctl = ipip6_tunnel_ioctl,
|
||||||
.ndo_get_stats64 = ip_tunnel_get_stats64,
|
.ndo_get_stats64 = ip_tunnel_get_stats64,
|
||||||
.ndo_get_iflink = ip_tunnel_get_iflink,
|
.ndo_get_iflink = ip_tunnel_get_iflink,
|
||||||
|
.ndo_tunnel_ctl = ipip6_tunnel_ctl,
|
||||||
};
|
};
|
||||||
|
|
||||||
static void ipip6_dev_free(struct net_device *dev)
|
static void ipip6_dev_free(struct net_device *dev)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue