diff options
| author | David S. Miller <davem@davemloft.net> | 2018-01-24 23:48:11 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-24 23:48:11 -0500 |
| commit | 8ec59b44a00635f31ce78753c9cac3010d4bd66a (patch) | |
| tree | f869e44ed7613235e926260144c3de703655800a /net/ipv4/fib_frontend.c | |
| parent | 955bd1d216c6ce4f40b181cfd369f4116e0627f2 (diff) | |
| parent | 5c59e564e46dcbab2ee7a4e9e0243562a39679a2 (diff) | |
| download | op-kernel-dev-8ec59b44a00635f31ce78753c9cac3010d4bd66a.zip op-kernel-dev-8ec59b44a00635f31ce78753c9cac3010d4bd66a.tar.gz | |
Merge branch 'rebased-net-ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/fib_frontend.c')
| -rw-r--r-- | net/ipv4/fib_frontend.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c index 08259d0..f05afaf 100644 --- a/net/ipv4/fib_frontend.c +++ b/net/ipv4/fib_frontend.c @@ -587,10 +587,9 @@ static int rtentry_to_fib_config(struct net *net, int cmd, struct rtentry *rt, * Handle IP routing ioctl calls. * These are used to manipulate the routing tables */ -int ip_rt_ioctl(struct net *net, unsigned int cmd, void __user *arg) +int ip_rt_ioctl(struct net *net, unsigned int cmd, struct rtentry *rt) { struct fib_config cfg; - struct rtentry rt; int err; switch (cmd) { @@ -599,11 +598,8 @@ int ip_rt_ioctl(struct net *net, unsigned int cmd, void __user *arg) if (!ns_capable(net->user_ns, CAP_NET_ADMIN)) return -EPERM; - if (copy_from_user(&rt, arg, sizeof(rt))) - return -EFAULT; - rtnl_lock(); - err = rtentry_to_fib_config(net, cmd, &rt, &cfg); + err = rtentry_to_fib_config(net, cmd, rt, &cfg); if (err == 0) { struct fib_table *tb; |
