net: socket: return changed ifreq from SIOCDEVPRIVATE

Some drivers that use SIOCDEVPRIVATE ioctl commands modify
the ifreq structure and expect it to be passed back to user
space, which has never really happened for compat mode
because the calling these drivers through ndo_do_ioctl
requires overwriting the ifr_data pointer.

Now that all drivers are converted to ndo_siocdevprivate,
change it to handle this correctly in both compat and
native mode.

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

diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c
index e0586bc..70a379c 100644 (file)
--- a/net/core/dev_ioctl.c
+++ b/net/core/dev_ioctl.c
@@ -286,9 +286,7 @@ static int dev_siocdevprivate(struct net_device *dev, struct ifreq *ifr,
                        return -ENODEV;
        }
 
-       /* fall back to do_ioctl for drivers not yet converted */
-       ifr->ifr_data = data;
-       return dev_do_ioctl(dev, ifr, cmd);
+       return -EOPNOTSUPP;
 }
 
 static int dev_siocwandev(struct net_device *dev, struct if_settings *ifs)

diff --git a/net/socket.c b/net/socket.c
index ddce632..48471a2 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -3234,7 +3234,7 @@ static int compat_sock_ioctl_trans(struct file *file, struct socket *sock,
        struct net *net = sock_net(sk);
 
        if (cmd >= SIOCDEVPRIVATE && cmd <= (SIOCDEVPRIVATE + 15))
-               return compat_ifr_data_ioctl(net, cmd, argp);
+               return sock_ioctl(file, cmd, (unsigned long)argp);
 
        switch (cmd) {
        case SIOCSIFBR: