net: socket: rework compat_ifreq_ioctl()

compat_ifreq_ioctl() is one of the last users of copy_in_user() and
compat_alloc_user_space(), as it attempts to convert the 'struct ifreq'
arguments from 32-bit to 64-bit format as used by dev_ioctl() and a
couple of socket family specific interpretations.

The current implementation works correctly when calling dev_ioctl(),
inet_ioctl(), ieee802154_sock_ioctl(), atalk_ioctl(), qrtr_ioctl()
and packet_ioctl(). The ioctl handlers for x25, netrom, rose and x25 do
not interpret the arguments and only block the corresponding commands,
so they do not care.

For af_inet6 and af_decnet however, the compat conversion is slightly
incorrect, as it will copy more data than the native handler accesses,
both of them use a structure that is shorter than ifreq.

Replace the copy_in_user() conversion with a pair of accessor functions
to read and write the ifreq data in place with the correct length where
needed, while leaving the other ones to copy the (already compatible)
structures directly.

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

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index da2c273c7e0ab0370269473aa61703b2928baf71..c871dc223dfa7c1dfa84202e0c45277e581e8741 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -4006,6 +4006,8 @@ int netdev_rx_handler_register(struct net_device *dev,
 void netdev_rx_handler_unregister(struct net_device *dev);
 
 bool dev_valid_name(const char *name);
+int get_user_ifreq(struct ifreq *ifr, void __user **ifrdata, void __user *arg);
+int put_user_ifreq(struct ifreq *ifr, void __user *arg);
 int dev_ioctl(struct net *net, unsigned int cmd, struct ifreq *ifr,
                bool *need_copyout);
 int dev_ifconf(struct net *net, struct ifconf __user *ifc);

diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c
index 8ade5a4ceaf5dd6707a118a65a3cb1a4ae39bbaf..bf5736c1d4584ec977586eae44d36db0042f7132 100644 (file)
--- a/net/appletalk/ddp.c
+++ b/net/appletalk/ddp.c
@@ -666,7 +666,7 @@ static int atif_ioctl(int cmd, void __user *arg)
        struct rtentry rtdef;
        int add_route;
 
-       if (copy_from_user(&atreq, arg, sizeof(atreq)))
+       if (get_user_ifreq(&atreq, NULL, arg))
                return -EFAULT;
 
        dev = __dev_get_by_name(&init_net, atreq.ifr_name);
@@ -865,7 +865,7 @@ static int atif_ioctl(int cmd, void __user *arg)
                return 0;
        }
 
-       return copy_to_user(arg, &atreq, sizeof(atreq)) ? -EFAULT : 0;
+       return put_user_ifreq(&atreq, arg);
 }
 
 static int atrtr_ioctl_addrt(struct rtentry *rt)

diff --git a/net/ieee802154/socket.c b/net/ieee802154/socket.c
index a45a0401adc50b00091de6ec8d041a48a1c03385..f5077de3619e3ddbd5c3ac7695fdc7045c35a4ee 100644 (file)
--- a/net/ieee802154/socket.c
+++ b/net/ieee802154/socket.c
@@ -129,7 +129,7 @@ static int ieee802154_dev_ioctl(struct sock *sk, struct ifreq __user *arg,
        int ret = -ENOIOCTLCMD;
        struct net_device *dev;
 
-       if (copy_from_user(&ifr, arg, sizeof(struct ifreq)))
+       if (get_user_ifreq(&ifr, NULL, arg))
                return -EFAULT;
 
        ifr.ifr_name[IFNAMSIZ-1] = 0;
@@ -143,7 +143,7 @@ static int ieee802154_dev_ioctl(struct sock *sk, struct ifreq __user *arg,
        if (dev->type == ARPHRD_IEEE802154 && dev->netdev_ops->ndo_do_ioctl)
                ret = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, cmd);
 
-       if (!ret && copy_to_user(arg, &ifr, sizeof(struct ifreq)))
+       if (!ret && put_user_ifreq(&ifr, arg))
                ret = -EFAULT;
        dev_put(dev);
 

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 54648181dd567d038be69cd469bac5d114c50127..0e4d758c2585f3178021021c9d2d3cc714c6aa43 100644 (file)
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -953,10 +953,10 @@ int inet_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
        case SIOCGIFNETMASK:
        case SIOCGIFDSTADDR:
        case SIOCGIFPFLAGS:
-               if (copy_from_user(&ifr, p, sizeof(struct ifreq)))
+               if (get_user_ifreq(&ifr, NULL, p))
                        return -EFAULT;
                err = devinet_ioctl(net, cmd, &ifr);
-               if (!err && copy_to_user(p, &ifr, sizeof(struct ifreq)))
+               if (!err && put_user_ifreq(&ifr, p))
                        err = -EFAULT;
                break;
 
@@ -966,7 +966,7 @@ int inet_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
        case SIOCSIFDSTADDR:
        case SIOCSIFPFLAGS:
        case SIOCSIFFLAGS:
-               if (copy_from_user(&ifr, p, sizeof(struct ifreq)))
+               if (get_user_ifreq(&ifr, NULL, p))
                        return -EFAULT;
                err = devinet_ioctl(net, cmd, &ifr);
                break;

diff --git a/net/qrtr/qrtr.c b/net/qrtr/qrtr.c
index e6f4a6202f8212f3b8c83824aa9227e127b3ac75..e7184787724816e3dc16b384227fc0c609af061e 100644 (file)
--- a/net/qrtr/qrtr.c
+++ b/net/qrtr/qrtr.c
@@ -1153,14 +1153,14 @@ static int qrtr_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                rc = put_user(len, (int __user *)argp);
                break;
        case SIOCGIFADDR:
-               if (copy_from_user(&ifr, argp, sizeof(ifr))) {
+               if (get_user_ifreq(&ifr, NULL, argp)) {
                        rc = -EFAULT;
                        break;
                }
 
                sq = (struct sockaddr_qrtr *)&ifr.ifr_addr;
                *sq = ipc->us;
-               if (copy_to_user(argp, &ifr, sizeof(ifr))) {
+               if (put_user_ifreq(&ifr, argp)) {
                        rc = -EFAULT;
                        break;
                }

diff --git a/net/socket.c b/net/socket.c
index ecdb7913a3bdca584d964819e97fb21a3fe2e2d9..84de89c1ee9d0f1b17ff03d16188e151f323f52e 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -3121,6 +3121,54 @@ void socket_seq_show(struct seq_file *seq)
 }
 #endif                         /* CONFIG_PROC_FS */
 
+/* Handle the fact that while struct ifreq has the same *layout* on
+ * 32/64 for everything but ifreq::ifru_ifmap and ifreq::ifru_data,
+ * which are handled elsewhere, it still has different *size* due to
+ * ifreq::ifru_ifmap (which is 16 bytes on 32 bit, 24 bytes on 64-bit,
+ * resulting in struct ifreq being 32 and 40 bytes respectively).
+ * As a result, if the struct happens to be at the end of a page and
+ * the next page isn't readable/writable, we get a fault. To prevent
+ * that, copy back and forth to the full size.
+ */
+int get_user_ifreq(struct ifreq *ifr, void __user **ifrdata, void __user *arg)
+{
+       if (in_compat_syscall()) {
+               struct compat_ifreq *ifr32 = (struct compat_ifreq *)ifr;
+
+               memset(ifr, 0, sizeof(*ifr));
+               if (copy_from_user(ifr32, arg, sizeof(*ifr32)))
+                       return -EFAULT;
+
+               if (ifrdata)
+                       *ifrdata = compat_ptr(ifr32->ifr_data);
+
+               return 0;
+       }
+
+       if (copy_from_user(ifr, arg, sizeof(*ifr)))
+               return -EFAULT;
+
+       if (ifrdata)
+               *ifrdata = ifr->ifr_data;
+
+       return 0;
+}
+EXPORT_SYMBOL(get_user_ifreq);
+
+int put_user_ifreq(struct ifreq *ifr, void __user *arg)
+{
+       size_t size = sizeof(*ifr);
+
+       if (in_compat_syscall())
+               size = sizeof(struct compat_ifreq);
+
+       if (copy_to_user(arg, ifr, size))
+               return -EFAULT;
+
+       return 0;
+}
+EXPORT_SYMBOL(put_user_ifreq);
+
 #ifdef CONFIG_COMPAT
 static int compat_siocwandev(struct net *net, struct compat_ifreq __user *uifr32)
 {
@@ -3129,7 +3177,7 @@ static int compat_siocwandev(struct net *net, struct compat_ifreq __user *uifr32
        void __user *saved;
        int err;
 
-       if (copy_from_user(&ifr, uifr32, sizeof(struct compat_ifreq)))
+       if (get_user_ifreq(&ifr, NULL, uifr32))
                return -EFAULT;
 
        if (get_user(uptr32, &uifr32->ifr_settings.ifs_ifsu))
@@ -3141,7 +3189,7 @@ static int compat_siocwandev(struct net *net, struct compat_ifreq __user *uifr32
        err = dev_ioctl(net, SIOCWANDEV, &ifr, NULL);
        if (!err) {
                ifr.ifr_settings.ifs_ifsu.raw_hdlc = saved;
-               if (copy_to_user(uifr32, &ifr, sizeof(struct compat_ifreq)))
+               if (put_user_ifreq(&ifr, uifr32))
                        err = -EFAULT;
        }
        return err;
@@ -3165,49 +3213,28 @@ static int compat_ifr_data_ioctl(struct net *net, unsigned int cmd,
 
 static int compat_ifreq_ioctl(struct net *net, struct socket *sock,
                              unsigned int cmd,
+                             unsigned long arg,
                              struct compat_ifreq __user *uifr32)
 {
-       struct ifreq __user *uifr;
+       struct ifreq ifr;
+       bool need_copyout;
        int err;
 
-       /* Handle the fact that while struct ifreq has the same *layout* on
-        * 32/64 for everything but ifreq::ifru_ifmap and ifreq::ifru_data,
-        * which are handled elsewhere, it still has different *size* due to
-        * ifreq::ifru_ifmap (which is 16 bytes on 32 bit, 24 bytes on 64-bit,
-        * resulting in struct ifreq being 32 and 40 bytes respectively).
-        * As a result, if the struct happens to be at the end of a page and
-        * the next page isn't readable/writable, we get a fault. To prevent
-        * that, copy back and forth to the full size.
+       err = sock->ops->ioctl(sock, cmd, arg);
+
+       /* If this ioctl is unknown try to hand it down
+        * to the NIC driver.
         */
+       if (err != -ENOIOCTLCMD)
+               return err;
 
-       uifr = compat_alloc_user_space(sizeof(*uifr));
-       if (copy_in_user(uifr, uifr32, sizeof(*uifr32)))
+       if (get_user_ifreq(&ifr, NULL, uifr32))
                return -EFAULT;
+       err = dev_ioctl(net, cmd, &ifr, &need_copyout);
+       if (!err && need_copyout)
+               if (put_user_ifreq(&ifr, uifr32))
+                       return -EFAULT;
 
-       err = sock_do_ioctl(net, sock, cmd, (unsigned long)uifr);
-
-       if (!err) {
-               switch (cmd) {
-               case SIOCGIFFLAGS:
-               case SIOCGIFMETRIC:
-               case SIOCGIFMTU:
-               case SIOCGIFMEM:
-               case SIOCGIFHWADDR:
-               case SIOCGIFINDEX:
-               case SIOCGIFADDR:
-               case SIOCGIFBRDADDR:
-               case SIOCGIFDSTADDR:
-               case SIOCGIFNETMASK:
-               case SIOCGIFPFLAGS:
-               case SIOCGIFTXQLEN:
-               case SIOCGMIIPHY:
-               case SIOCGMIIREG:
-               case SIOCGIFNAME:
-                       if (copy_in_user(uifr32, uifr, sizeof(*uifr32)))
-                               err = -EFAULT;
-                       break;
-               }
-       }
        return err;
 }
 
@@ -3310,7 +3337,7 @@ static int compat_sock_ioctl_trans(struct file *file, struct socket *sock,
        case SIOCBONDRELEASE:
        case SIOCBONDSETHWADDR:
        case SIOCBONDCHANGEACTIVE:
-               return compat_ifreq_ioctl(net, sock, cmd, argp);
+               return compat_ifreq_ioctl(net, sock, cmd, arg, argp);
 
        case SIOCSARP:
        case SIOCGARP: