diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2021-07-27 15:45:15 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2021-07-27 20:11:45 +0100 |
| commit | 88fc023f7de22922c6c61e2f3d4c54befb8b3549 (patch) | |
| tree | e28612f0cf560893e4b6dd170d5dd8d131308016 /net/socket.c | |
| parent | net: split out ndo_siowandev ioctl (diff) | |
| download | linux-dev-88fc023f7de22922c6c61e2f3d4c54befb8b3549.tar.xz linux-dev-88fc023f7de22922c6c61e2f3d4c54befb8b3549.zip | |
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>
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c index ddce6327633e..48471a219c1d 100644 --- 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: |