ipv6: move SIOCADDRT and SIOCDELRT handling into ->compat_ioctl

To prepare removing the global routing_ioctl hack start lifting the code
into a newly added ipv6 ->compat_ioctl handler.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 955badd..5fc3a9d 100644 (file)
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -1115,6 +1115,8 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len);
 int inet6_getname(struct socket *sock, struct sockaddr *uaddr,
                  int peer);
 int inet6_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);
+int inet6_compat_ioctl(struct socket *sock, unsigned int cmd,
+               unsigned long arg);
 
 int inet6_hash_connect(struct inet_timewait_death_row *death_row,
                              struct sock *sk);

diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
index 1e5e08c..650187d 100644 (file)
--- a/net/dccp/ipv6.c
+++ b/net/dccp/ipv6.c
@@ -1082,6 +1082,7 @@ static const struct proto_ops inet6_dccp_ops = {
        .mmap              = sock_no_mmap,
        .sendpage          = sock_no_sendpage,
 #ifdef CONFIG_COMPAT
+       .compat_ioctl      = inet6_compat_ioctl,
        .compat_setsockopt = compat_sock_common_setsockopt,
        .compat_getsockopt = compat_sock_common_getsockopt,
 #endif

diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index a618beb..b69496e 100644 (file)
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -60,6 +60,7 @@
 #include <net/calipso.h>
 #include <net/seg6.h>
 #include <net/rpl.h>
+#include <net/compat.h>
 
 #include <linux/uaccess.h>
 #include <linux/mroute6.h>
@@ -571,6 +572,56 @@ int inet6_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 }
 EXPORT_SYMBOL(inet6_ioctl);
 
+#ifdef CONFIG_COMPAT
+struct compat_in6_rtmsg {
+       struct in6_addr         rtmsg_dst;
+       struct in6_addr         rtmsg_src;
+       struct in6_addr         rtmsg_gateway;
+       u32                     rtmsg_type;
+       u16                     rtmsg_dst_len;
+       u16                     rtmsg_src_len;
+       u32                     rtmsg_metric;
+       u32                     rtmsg_info;
+       u32                     rtmsg_flags;
+       s32                     rtmsg_ifindex;
+};
+
+static int inet6_compat_routing_ioctl(struct sock *sk, unsigned int cmd,
+               struct compat_in6_rtmsg __user *ur)
+{
+       struct in6_rtmsg rt;
+
+       if (copy_from_user(&rt.rtmsg_dst, &ur->rtmsg_dst,
+                       3 * sizeof(struct in6_addr)) ||
+           get_user(rt.rtmsg_type, &ur->rtmsg_type) ||
+           get_user(rt.rtmsg_dst_len, &ur->rtmsg_dst_len) ||
+           get_user(rt.rtmsg_src_len, &ur->rtmsg_src_len) ||
+           get_user(rt.rtmsg_metric, &ur->rtmsg_metric) ||
+           get_user(rt.rtmsg_info, &ur->rtmsg_info) ||
+           get_user(rt.rtmsg_flags, &ur->rtmsg_flags) ||
+           get_user(rt.rtmsg_ifindex, &ur->rtmsg_ifindex))
+               return -EFAULT;
+
+
+       return ipv6_route_ioctl(sock_net(sk), cmd, &rt);
+}
+
+int inet6_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
+{
+       void __user *argp = compat_ptr(arg);
+       struct sock *sk = sock->sk;
+
+       switch (cmd) {
+       case SIOCADDRT:
+       case SIOCDELRT:
+               return inet6_compat_routing_ioctl(sk, cmd, argp);
+       default:
+               return -ENOIOCTLCMD;
+       }
+}
+EXPORT_SYMBOL_GPL(inet6_compat_ioctl);
+#endif /* CONFIG_COMPAT */
+
 INDIRECT_CALLABLE_DECLARE(int udpv6_sendmsg(struct sock *, struct msghdr *,
                                            size_t));
 int inet6_sendmsg(struct socket *sock, struct msghdr *msg, size_t size)
@@ -632,6 +683,7 @@ const struct proto_ops inet6_stream_ops = {
        .read_sock         = tcp_read_sock,
        .peek_len          = tcp_peek_len,
 #ifdef CONFIG_COMPAT
+       .compat_ioctl      = inet6_compat_ioctl,
        .compat_setsockopt = compat_sock_common_setsockopt,
        .compat_getsockopt = compat_sock_common_getsockopt,
 #endif
@@ -660,6 +712,7 @@ const struct proto_ops inet6_dgram_ops = {
        .sendpage          = sock_no_sendpage,
        .set_peek_off      = sk_set_peek_off,
 #ifdef CONFIG_COMPAT
+       .compat_ioctl      = inet6_compat_ioctl,
        .compat_setsockopt = compat_sock_common_setsockopt,
        .compat_getsockopt = compat_sock_common_getsockopt,
 #endif

diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 0028aa1..8ef5a7b 100644 (file)
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -1377,6 +1377,7 @@ const struct proto_ops inet6_sockraw_ops = {
        .mmap              = sock_no_mmap,
        .sendpage          = sock_no_sendpage,
 #ifdef CONFIG_COMPAT
+       .compat_ioctl      = inet6_compat_ioctl,
        .compat_setsockopt = compat_sock_common_setsockopt,
        .compat_getsockopt = compat_sock_common_getsockopt,
 #endif

diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c
index d148766..fdfef92 100644 (file)
--- a/net/l2tp/l2tp_ip6.c
+++ b/net/l2tp/l2tp_ip6.c
@@ -758,6 +758,7 @@ static const struct proto_ops l2tp_ip6_ops = {
        .mmap              = sock_no_mmap,
        .sendpage          = sock_no_sendpage,
 #ifdef CONFIG_COMPAT
+       .compat_ioctl      = inet6_compat_ioctl,
        .compat_setsockopt = compat_sock_common_setsockopt,
        .compat_getsockopt = compat_sock_common_getsockopt,
 #endif

diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index e3a628b..ba9d3d5 100644 (file)
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -2068,6 +2068,7 @@ static const struct proto_ops mptcp_v6_stream_ops = {
        .mmap              = sock_no_mmap,
        .sendpage          = inet_sendpage,
 #ifdef CONFIG_COMPAT
+       .compat_ioctl      = inet6_compat_ioctl,
        .compat_setsockopt = compat_sock_common_setsockopt,
        .compat_getsockopt = compat_sock_common_getsockopt,
 #endif

diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
index c87af43..ccfa0ab 100644 (file)
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
@@ -1032,6 +1032,7 @@ static const struct proto_ops inet6_seqpacket_ops = {
        .recvmsg           = inet_recvmsg,
        .mmap              = sock_no_mmap,
 #ifdef CONFIG_COMPAT
+       .compat_ioctl      = inet6_compat_ioctl,
        .compat_setsockopt = compat_sock_common_setsockopt,
        .compat_getsockopt = compat_sock_common_getsockopt,
 #endif

diff --git a/net/socket.c b/net/socket.c
index 1c9a726..6824470 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -3384,62 +3384,33 @@ struct rtentry32 {
        unsigned short  rt_irtt;        /* Initial RTT                  */
 };
 
-struct in6_rtmsg32 {
-       struct in6_addr         rtmsg_dst;
-       struct in6_addr         rtmsg_src;
-       struct in6_addr         rtmsg_gateway;
-       u32                     rtmsg_type;
-       u16                     rtmsg_dst_len;
-       u16                     rtmsg_src_len;
-       u32                     rtmsg_metric;
-       u32                     rtmsg_info;
-       u32                     rtmsg_flags;
-       s32                     rtmsg_ifindex;
-};
-
 static int routing_ioctl(struct net *net, struct socket *sock,
                         unsigned int cmd, void __user *argp)
 {
+       struct rtentry32 __user *ur4 = argp;
        int ret;
        void *r = NULL;
-       struct in6_rtmsg r6;
        struct rtentry r4;
        char devname[16];
        u32 rtdev;
        mm_segment_t old_fs = get_fs();
 
-       if (sock && sock->sk && sock->sk->sk_family == AF_INET6) { /* ipv6 */
-               struct in6_rtmsg32 __user *ur6 = argp;
-               ret = copy_from_user(&r6.rtmsg_dst, &(ur6->rtmsg_dst),
-                       3 * sizeof(struct in6_addr));
-               ret |= get_user(r6.rtmsg_type, &(ur6->rtmsg_type));
-               ret |= get_user(r6.rtmsg_dst_len, &(ur6->rtmsg_dst_len));
-               ret |= get_user(r6.rtmsg_src_len, &(ur6->rtmsg_src_len));
-               ret |= get_user(r6.rtmsg_metric, &(ur6->rtmsg_metric));
-               ret |= get_user(r6.rtmsg_info, &(ur6->rtmsg_info));
-               ret |= get_user(r6.rtmsg_flags, &(ur6->rtmsg_flags));
-               ret |= get_user(r6.rtmsg_ifindex, &(ur6->rtmsg_ifindex));
-
-               r = (void *) &r6;
-       } else { /* ipv4 */
-               struct rtentry32 __user *ur4 = argp;
-               ret = copy_from_user(&r4.rt_dst, &(ur4->rt_dst),
-                                       3 * sizeof(struct sockaddr));
-               ret |= get_user(r4.rt_flags, &(ur4->rt_flags));
-               ret |= get_user(r4.rt_metric, &(ur4->rt_metric));
-               ret |= get_user(r4.rt_mtu, &(ur4->rt_mtu));
-               ret |= get_user(r4.rt_window, &(ur4->rt_window));
-               ret |= get_user(r4.rt_irtt, &(ur4->rt_irtt));
-               ret |= get_user(rtdev, &(ur4->rt_dev));
-               if (rtdev) {
-                       ret |= copy_from_user(devname, compat_ptr(rtdev), 15);
-                       r4.rt_dev = (char __user __force *)devname;
-                       devname[15] = 0;
-               } else
-                       r4.rt_dev = NULL;
-
-               r = (void *) &r4;
-       }
+       ret = copy_from_user(&r4.rt_dst, &(ur4->rt_dst),
+                               3 * sizeof(struct sockaddr));
+       ret |= get_user(r4.rt_flags, &(ur4->rt_flags));
+       ret |= get_user(r4.rt_metric, &(ur4->rt_metric));
+       ret |= get_user(r4.rt_mtu, &(ur4->rt_mtu));
+       ret |= get_user(r4.rt_window, &(ur4->rt_window));
+       ret |= get_user(r4.rt_irtt, &(ur4->rt_irtt));
+       ret |= get_user(rtdev, &(ur4->rt_dev));
+       if (rtdev) {
+               ret |= copy_from_user(devname, compat_ptr(rtdev), 15);
+               r4.rt_dev = (char __user __force *)devname;
+               devname[15] = 0;
+       } else
+               r4.rt_dev = NULL;
+
+       r = (void *) &r4;
 
        if (ret) {
                ret = -EFAULT;