xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ipv6: lift copy_from_user out of ipv6_route_ioctl

Browse Source 
Prepare for better compat ioctl handling by moving the user copy out
of ipv6_route_ioctl.

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-18 08:28:05 +02:00
committed by David S. Miller
parent a307593a64
commit 7c1552da90
3 changed files with 29 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
net/ipv6/route.c
View File

@@ -4336,41 +4336,29 @@ static void rtmsg_to_fib6_config(struct net *net,
};
}
int ipv6_route_ioctl(struct net *net, unsigned int cmd, void __user *arg)
int ipv6_route_ioctl(struct net *net, unsigned int cmd, struct in6_rtmsg *rtmsg)
{
struct fib6_config cfg;
struct in6_rtmsg rtmsg;
int err;
if (cmd != SIOCADDRT && cmd != SIOCDELRT)
return -EINVAL;
if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
return -EPERM;
rtmsg_to_fib6_config(net, rtmsg, &cfg);
rtnl_lock();
switch (cmd) {
case SIOCADDRT: /* Add a route */
case SIOCDELRT: /* Delete a route */
if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
return -EPERM;
err = copy_from_user(&rtmsg, arg,
sizeof(struct in6_rtmsg));
if (err)
return -EFAULT;
rtmsg_to_fib6_config(net, &rtmsg, &cfg);
rtnl_lock();
switch (cmd) {
case SIOCADDRT:
err = ip6_route_add(&cfg, GFP_KERNEL, NULL);
break;
case SIOCDELRT:
err = ip6_route_del(&cfg, NULL);
break;
default:
err = -EINVAL;
}
rtnl_unlock();
return err;
case SIOCADDRT:
err = ip6_route_add(&cfg, GFP_KERNEL, NULL);
break;
case SIOCDELRT:
err = ip6_route_del(&cfg, NULL);
break;
}
return -EINVAL;
rtnl_unlock();
return err;
}
/*