diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2020-05-11 00:13:56 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2020-05-21 02:31:36 +0200 |
| commit | 0edecc020b33f8e31d8baa80735b45e8e8434700 (patch) | |
| tree | 3c3a65e315bd9d8897e7b98b93cc347fc1ddf438 | |
| parent | atm: lift copyin from atm_dev_ioctl() (diff) | |
| download | linux-0edecc020b33f8e31d8baa80735b45e8e8434700.tar.xz linux-0edecc020b33f8e31d8baa80735b45e8e8434700.zip | |
atm: switch do_atmif_sioc() to direct use of atm_dev_ioctl()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | net/atm/ioctl.c | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/net/atm/ioctl.c b/net/atm/ioctl.c index 52f2c77e656f..838ebf0cabbf 100644 --- a/net/atm/ioctl.c +++ b/net/atm/ioctl.c @@ -286,30 +286,13 @@ static int do_atm_iobuf(struct socket *sock, unsigned int cmd, static int do_atmif_sioc(struct socket *sock, unsigned int cmd, unsigned long arg) { - struct atmif_sioc __user *sioc; - struct compat_atmif_sioc __user *sioc32; + struct compat_atmif_sioc __user *sioc32 = compat_ptr(arg); + int number; u32 data; - void __user *datap; - int err; - sioc = compat_alloc_user_space(sizeof(*sioc)); - sioc32 = compat_ptr(arg); - - if (copy_in_user(&sioc->number, &sioc32->number, 2 * sizeof(int)) || - get_user(data, &sioc32->arg)) - return -EFAULT; - datap = compat_ptr(data); - if (put_user(datap, &sioc->arg)) + if (get_user(data, &sioc32->arg) || get_user(number, &sioc32->number)) return -EFAULT; - - err = do_vcc_ioctl(sock, cmd, (unsigned long) sioc, 0); - - if (!err) { - if (copy_in_user(&sioc32->length, &sioc->length, - sizeof(int))) - err = -EFAULT; - } - return err; + return atm_dev_ioctl(cmd, compat_ptr(data), &sioc32->length, number, 0); } static int do_atm_ioctl(struct socket *sock, unsigned int cmd32, |